symfony/Routing — pull request #4 by driesvints (2014-11-03 13:23:35+00:00)
Title: Remove merge conflict

Should do the trick. I believe this is the expected behavior with the `$this->condition` still in place?