symfony/symfony — pull request #12395 by ivanbarlog (2014-11-03 13:10:01+00:00)
Title: [Routing] Removed conflict notation

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