cief/izyim-api
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git synced 2026-08-24 23:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
Aqeeb Imtiaz Harun
2018-06-07 11:04:32 +08:00
parent 44bd05c03b
commit d4d5d39ec1
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/seeds/DatabaseSeeder.php
-3
View File
@@ -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
}
}