解决冲突

Signed-off-by: sunlei <sunlei@romens.cn>

backend/config/urlmanager.php

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