wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Aug 22, 2024 · 3b71ecd · 3b71ecd
1 parent 86e8464
commit 3b71ecd
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/src/TestCase.php b/src/TestCase.php
@@ -78,21 +78,6 @@ public static function applicationBasePath()
     public static function applicationBaseUrl()
     {
         return Env::get('DUSK_SERVE_URL') ?? \sprintf('http://%s:%d', static::getBaseServeHost(), static::getBaseServePort());
-<<<<<<< HEAD
-=======
-    }
-
-    /**
-     * Determine the application's base URL.
-     *
-     * @return string
-     *
-     * @deprecated Use static::applicationBaseUrl() instead.
-     */
-    public static function baseServeUrl()
-    {
-        return static::applicationBaseUrl();
->>>>>>> 6.x
     }
 
     /**