Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix faulty conflict resolution#7527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
dunglas wants to merge1 commit intosymfony:masterfromdunglas:patch-11

Conversation

@dunglas
Copy link
Member

@dunglasdunglas commentedFeb 24, 2017•
edited
Loading

Restoredd29e89

Copy link
Member

@javiereguiluzjaviereguiluz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

👍

xabbuh added a commit that referenced this pull requestFeb 28, 2017
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes#7527).Discussion----------Fix faulty conflict resolutionRestoredd29e89Commits-------febdde0 Fix faulty conflict resolution
@xabbuh
Copy link
Member

Thanks Kévin, I have merged this into the2.8 branch where the rest of the broken conflict resolution was already fixed by#6471.

@xabbuhxabbuh closed thisFeb 28, 2017
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@javiereguiluzjaviereguiluzjaviereguiluz approved these changes

Assignees

No one assigned

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dunglas@xabbuh@javiereguiluz@carsonbot
[8]ページ先頭
©2009-2025 Movatter.jp