symfony/Routing — pull request #5 by boyhagemann (2014-11-03 13:35:12+00:00)
Title: Fix merge confict in Route.php

This is a fix for the merge conflict. This is now correct right?