8000 Fix git diff marker by shyim · Pull Request #30382 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

Fix git diff marker #30382

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2019
Merged

Fix git diff marker #30382

merged 1 commit into from
Feb 26, 2019

Conversation

shyim
Copy link
Contributor
@shyim shyim commented Feb 26, 2019
Q A
Branch? 4.2
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #..
License MIT
Doc PR

There are some git diff marker :)

@xabbuh
Copy link
Member
xabbuh commented Feb 26, 2019

Good catch. 👍 Can you also remove the accidentally added setTrustedHeaderName() and getTrustedHeaderName() methods and rebase on the 4.2 branch?

@shyim shyim changed the base branch from master to 4.2 February 26, 2019 08:04
@shyim
Copy link
Contributor Author
shyim commented Feb 26, 2019

Done :)

@nicolas-grekas
Copy link
Member

Thank you @shyim.

@nicolas-grekas nicolas-grekas merged commit d631bd9 into symfony:4.2 Feb 26, 2019
nicolas-grekas added a commit that referenced this pull request Feb 26, 2019
This PR was merged into the 4.2 branch.

Discussion
----------

Fix git diff marker

| Q             | A
| ------------- | ---
| Branch?       | 4.2
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #..
| License       | MIT
| Doc PR        |

There are some git diff marker :)

Commits
-------

d631bd9 Fix git diff marker
@shyim shyim deleted the fix-conflict branch February 26, 2019 08:46
@xabbuh
Copy link
Member
xabbuh commented Feb 26, 2019

Congratulations for you first contribution @shyim!

@shyim
Copy link
Contributor Author
shyim commented Feb 26, 2019

It should be the second one 🤔
#28820 😅 but ty 😊

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
0