symfony/symfony — pull request #12381 by davidhemphill (2014-11-03 04:59:07+00:00)
Title: Remove git conflict-marked areas

This simply removes the merge conflict-marked areas and sets the code to use the 2.3 branches merged changes.