From c8ba47a662d87cac741b5d71a1d8a107bbc95e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Sat, 10 Aug 2019 13:19:21 +0200
Subject: [PATCH] wip

---
 tests/TestCase.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/TestCase.php b/tests/TestCase.php
index e14df382..6b499908 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -23,16 +23,13 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
         Redis::connection('tenancy')->flushdb();
         Redis::connection('cache')->flushdb();
 
-<<<<<<< HEAD
-=======
-        Artisan::call('migrate:fresh', [
-            '--path' => __DIR__ . '/../src/assets/migrations',
-        ]);
-        // dd(Artisan::output());
->>>>>>> 7fd274d2ced8467761315d490e5e1bb31bdb0ab7
         // $this->loadLaravelMigrations();
+
         $this->loadMigrationsFrom(__DIR__ . '/../src/assets/migrations');
-        Artisan::call('migrate:fresh');
+        
+        // Artisan::call('migrate:fresh', [
+        //     '--path' => __DIR__ . '/../src/assets/migrations'
+        // ]);
         // dd(Artisan::output());
 
         if ($this->autoCreateTenant) {