Skip to content

Conversation

bamarni
Copy link
Contributor

@bamarni bamarni commented Jul 18, 2012

No description provided.

@bamarni
Copy link
Contributor Author

bamarni commented Jul 18, 2012

hum don't know why it shows the previous commit too, does it conflict or is it ok?

@weaverryan
Copy link
Member

Hi Bilal!

Hmm, yes I think you're patch-3 branch must have somehow gotten my commit on it and brought it in there. Either way, these are good changes, but can you please re-make the changes against the 2.0 branch (since the typos are also on that branch)? Also, if you run git grep "// app/config/config.yml" from the command line, I think you'll find a few more places where we have the wrong file extension as well!

Thanks!

@bamarni bamarni merged commit 03be4a5 into symfony:master Jul 27, 2012
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.

2 participants