Fixed merge

Author: GrahamCampbell

tests/Foundation/FoundationApplicationTest.php

@@ -432,7 +432,6 @@ public function testEnvPathsAreUsedAndMadeAbsoluteForCachePathsWhenSpecifiedAsRe
         $this->assertSame($ds.'relative/path/config.php', $app->getCachedConfigPath());
         $this->assertSame($ds.'relative/path/routes.php', $app->getCachedRoutesPath());
         $this->assertSame($ds.'relative/path/events.php', $app->getCachedEventsPath());
-<<<<<<< HEAD
 
         unset(
             $_SERVER['APP_SERVICES_CACHE'],
@@ -458,8 +457,6 @@ public function testEnvPathsAreAbsoluteInWindows()
         $this->assertSame('C:\framework\config.php', $app->getCachedConfigPath());
         $this->assertSame('C:\framework\routes.php', $app->getCachedRoutesPath());
         $this->assertSame('C:\framework\events.php', $app->getCachedEventsPath());
-=======
->>>>>>> 6.x
 
         unset(
             $_SERVER['APP_SERVICES_CACHE'],