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/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -49,9 +49,9 @@ class RegisterController extends Controller
    protected function validator(array $data)
    {
        return Validator::make($data, [
-            'name' => 'required|string|max:255',
-            'email' => 'required|string|email|max:255|unique:users',
-            'password' => 'required|string|min:8|confirmed',
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
+            'password' => ['required', 'string', 'min:8', 'confirmed'],
        ]);
    }