diff --git a/app/api/BaseController.php b/app/api/BaseController.php
index 4f36c9d..55d2299 100644
--- a/app/api/BaseController.php
+++ b/app/api/BaseController.php
@@ -133,8 +133,6 @@ abstract class BaseController
             return json(['code'=>404,'msg'=>'token不能为空']);
         }
 
-<<<<<<< HEAD
-=======
 //             return $decoded->jti[0];
 //             exit;
 //             //var_dump($config);exit;
@@ -175,7 +173,6 @@ abstract class BaseController
 //         }
 
 // 暂时去除 -----------------------------------------------------
->>>>>>> master
     }
 
     /**
diff --git a/app/api/middleware.php b/app/api/middleware.php
index 13e3f70..91dea02 100644
--- a/app/api/middleware.php
+++ b/app/api/middleware.php
@@ -6,9 +6,4 @@ return [
 	//验证勾股cms是否完成安装
 	\app\home\middleware\Install::class,
     \app\api\middleware\AllowOriginMiddleware::class,
-<<<<<<< HEAD
-	// \app\api\middleware\Auth::class,
-=======
-
->>>>>>> master
 ];
\ No newline at end of file