Merge pull request #14101 from cakephp/routetest-merge

Fixed merge error in RouteTest.php

tests/TestCase/Routing/RouterTest.php

@@ -156,7 +156,6 @@ class RouterTest extends TestCase
     }
 
     /**
-<<<<<<< HEAD
      * Test that full base URL can be generated from request context too if
      * App.fullBaseUrl is not set.
      *
@@ -175,8 +174,6 @@ class RouterTest extends TestCase
     }
 
     /**
-=======
->>>>>>> 3.next
      * testRouteExists method
      *
      * @return void