From f333b68dff10e0652876dd0c71ffc4aeb20fa580 Mon Sep 17 00:00:00 2001
From: jack <jack@botahead.com>
Date: Tue, 22 May 2018 20:26:45 +0800
Subject: [PATCH] fix conflict

---
 app/Http/Controllers/AuthController.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index ac74dcb..4b6ec78 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/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;