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 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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
nicolas-grekas merged 1 commit intosymfony:4.2fromshyim:fix-conflict
Feb 26, 2019
Merged

Fix git diff marker#30382

nicolas-grekas merged 1 commit intosymfony:4.2fromshyim:fix-conflict
Feb 26, 2019

Conversation

@shyim
Copy link
Contributor

@shyimshyim commentedFeb 26, 2019•
edited
Loading

QA
Branch?4.2
Bug fix?no
New feature?no
BC breaks?no
Deprecations?no
Tests pass?yes
Fixed tickets#..
LicenseMIT
Doc PR

There are some git diff marker :)

@xabbuh
Copy link
Member

Good catch. 👍 Can you also remove the accidentally addedsetTrustedHeaderName() andgetTrustedHeaderName() methods and rebase on the4.2 branch?

@shyimshyim changed the base branch frommaster to4.2February 26, 2019 08:04
@shyim
Copy link
ContributorAuthor

shyim commentedFeb 26, 2019•
edited
Loading

Done :)

@nicolas-grekas
Copy link
Member

Thank you@shyim.

@nicolas-grekasnicolas-grekas merged commitd631bd9 intosymfony:4.2Feb 26, 2019
nicolas-grekas added a commit that referenced this pull requestFeb 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
@shyimshyim deleted the fix-conflict branchFebruary 26, 2019 08:46
@xabbuh
Copy link
Member

Congratulations for you first contribution@shyim!

@shyim
Copy link
ContributorAuthor

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

xabbuh, chalasr, mhujer, and JoshuaBehrens reacted with laugh emoji

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@OskarStarkOskarStarkOskarStark approved these changes

@xabbuhxabbuhxabbuh approved these changes

Assignees

No one assigned

Projects

None yet

Milestone

4.2

Development

Successfully merging this pull request may close these issues.

5 participants

@shyim@xabbuh@nicolas-grekas@OskarStark@carsonbot
[8]ページ先頭
©2009-2025 Movatter.jp