fix conflicts

2018-12-18 09:06:40 -06:00
parent b1763fe180 70532dd8ae
commit 4070dc98d4
30 changed files with 338 additions and 149 deletions
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -17,6 +17,7 @@ $factory->define(App\User::class, function (Faker $faker) {
    return [
        'name' => $faker->name,
        'email' => $faker->unique()->safeEmail,
+        'email_verified_at' => now(),
        'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
        'remember_token' => str_random(10),
    ];