From d4d5d39ec1a352f17624791e91bad1e38b68ebe0 Mon Sep 17 00:00:00 2001
From: Aqeeb Imtiaz Harun <aqeebimtiaz@gmail.com>
Date: Thu, 7 Jun 2018 11:04:32 +0800
Subject: [PATCH] Fixed conflict

---
 database/seeds/DatabaseSeeder.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index f10d079..1785f6c 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -11,12 +11,9 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-<<<<<<< HEAD
         $this->call(LaratrustSeeder::class);
         $this->call(UsersTableSeeder::class);
-=======
          //$this->call(UsersTableSeeder::class);
          $this->call(SoSeeder::class);
->>>>>>> 9619cab40743a5e70ea341c611c68500f2a047fe
     }
 }