Skip to content

fix doubled words #2658

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
May 26, 2013
Merged

fix doubled words #2658

merged 1 commit into from
May 26, 2013

Conversation

jbafford
Copy link
Contributor

Q A
Doc fix? yes
New docs? no
Applies to 2.2+
Fixed tickets n/a

Suggest applying after PR #2657, which includes typo fixes applicable to both 2.1 and 2.2+.

@TroodoNmike
Copy link

👍

@lyrixx
Copy link
Member

lyrixx commented May 26, 2013

👎 The branch 2.1 will be merged in 2.2. (and 2.2 in 2.3, and so on). So only PR against 2.1 is useful.
You can close this one, but leave open #2657

@jbafford
Copy link
Contributor Author

@lyrixx: #2657 has fixes that apply to both 2.1 and 2.2+. #2658 has a fix that only applies only to 2.2+; it does not include the fixes in #2657. Both should still be merged.

@wouterj
Copy link
Member

wouterj commented May 26, 2013

👍

weaverryan added a commit that referenced this pull request May 26, 2013
@weaverryan weaverryan merged commit 4618929 into symfony:2.2 May 26, 2013
@weaverryan
Copy link
Member

Thanks again John - perfectly executed PR's, and very clear instructions on why you broke things up. It can be a bit confusing now that we have many branches :).

@jbafford jbafford deleted the doubled-words-22 branch May 26, 2013 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants