修改冲突

backend/config/urlmanager.php

@@ -292,7 +292,7 @@ return [
                         'POST,OPTIONS assign-authority-role' => 'assign-authority-role',
                     ],
                 ],
-<<<<<<< Updated upstream
+
                 //权限节点
                 [
                     'class' => 'yii\rest\UrlRule',
@@ -306,9 +306,9 @@ return [
                         'POST,OPTIONS node-add' => 'node-add',
                         'DELETE,OPTIONS node-del' => 'node-del',
                     ]
-=======
-                //权限-管理员列表
-                [
+                ],
+                 //权限-管理员列表
+                 [
                     'class'=>'yii\rest\UrlRule',
                     'controller'=>[
                         'v1/authority/manage-list',
@@ -316,7 +316,6 @@ return [
                     'extraPatterns'=>[
                         'GET,OPTIONS get-manage-list' => 'get-manage-list',
                     ],
->>>>>>> Stashed changes
                 ],
             ],    
         ],