8000 Fixed a bad merge by javiereguiluz · Pull Request #9785 · symfony/symfony-docs · GitHub
[go: up one dir, main page]
Skip to content

Fixed a bad merge #9785

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 16, 2018
Merged

Fixed a bad merge #9785

merged 1 commit into from
May 16, 2018

Conversation

javiereguiluz
Copy link
Member

Fixes 35e4224.

@javiereguiluz javiereguiluz added this to the 2.7 milestone May 16, 2018
@javiereguiluz javiereguiluz merged commit 58f7807 into symfony:2.7 May 16, 2018
javiereguiluz added a commit that referenced this pull request May 16, 2018
@javiereguiluz
minor #9785 Fixed a bad merge (javiereguiluz)
fb3c599 
This PR was merged into the 2.7 branch.

Discussion
----------

Fixed a bad merge

Fixes 35e4224.

Commits
-------

58f7807 Fixed a bad merge
@javiereguiluz javiereguiluz deleted the fix_35e4224 branch May 24, 2018 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug Status: Needs Review
Projects
None yet
Milestone
2.7
Development

Successfully merging this pull request may close these issues.
2 participants
@javiereguiluz @carsonbot
0