fix conflict

ahmedbally · Dec 29, 2021 · 48ac2cd · 48ac2cd
2 parents 5234e88 + c64ee73
commit 48ac2cd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/LaravelHyperpayServiceProvider.php b/src/LaravelHyperpayServiceProvider.php
@@ -69,7 +69,6 @@ protected function registerPublishing()
         }
     }
 
-
     /**
      * Register the application services.
      */

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -17,6 +17,7 @@ public function setUp(): void
 
     protected function defineDatabaseMigrations()
     {
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
         $this->loadLaravelMigrations();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,6 @@ protected function registerPublishing() @@
             }
         }
         /**
          * Register the application services.
          */
@@ Expand Down @@