From b96ffa42053845ee3d624b6623e25537407b51ed Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 18 May 2022 15:01:04 +0800
Subject: [PATCH] solve conflict

---
 pc4mobx/organization/index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js
index d59d092..8abf7ad 100644
--- a/pc4mobx/organization/index.js
+++ b/pc4mobx/organization/index.js
@@ -44,11 +44,8 @@ const Routes = (
     <Route key="group" path="group" component={Group} />
     <Route key="officeManage" path="officeManage" component={OfficeManage} />
     <Route key="companyExtend" path="companyExtend" component={CompanyExtend} />
-<<<<<<< HEAD
     <Route key="branchNumSetting" path="branchNumSetting" component={BranchNumSetting} />
-=======
     <Route key="company" path="company" component={Company} />
->>>>>>> feature/cl
   </Route>
 );