fixed wrong merge

fabpot · fabpot · commit 0bb20cbfe98b · 2015-01-07T17:14:11.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
@@ -137,11 +137,3 @@ public function getUser()
         return parent::getUser();
     }
 }
-
-class TestController extends Controller
-{
-    public function forward($controller, array $path = array(), array $query = array())
-    {
-        return parent::forward($controller, $path, $query);
-    }
-}

Original file line number	Diff line number	Diff line change
`@@ -137,11 +137,3 @@ public function getUser()`
`137`	`137`	`return parent::getUser();`
`138`	`138`	`}`
`139`	`139`	`}`
`140`		`-`
`141`		`-class TestController extends Controller`
`142`		`-{`
`143`		`- public function forward($controller, array $path = array(), array $query = array())`
`144`		`- {`
`145`		`- return parent::forward($controller, $path, $query);`
`146`		`- }`
`147`		`-}`