fix conflict

app/Http/Controllers/AuthController.php

@@ -125,13 +125,7 @@ class AuthController extends Controller
         if($validator->fails()) {
             return response()->json(['success'=> false, 'error'=> $validator->messages()]);
         }
-<<<<<<< HEAD
         
-=======
-
-
-
->>>>>>> d8a439fa425cb71cda9f9fe4f2864e4394138198
         $name = $request->name;
         $password = $request->password;
         $role = $request->role;