fix conflicts

This commit is contained in:
yogesh_gohil
2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions

View File

@ -15,10 +15,10 @@ class UsersTableSeeder extends Seeder
public function run()
{
User::create([
'email' => 'admin@crater.in',
'email' => 'admin@craterapp.com',
'name' => 'Jane Doe',
'role' => 'admin',
'password' => Hash::make('admin@123')
'password' => Hash::make('crater@123')
]);
Setting::setSetting('profile_complete', 0);