!6 1

Merge pull request !6 from reset/feature/cl
2022-05-18 07:02:09 +00:00 · 2022-05-18 07:02:09 +00:00 · e7e1410cef
parent 15e223269d b96ffa4205
commit e7e1410cef
1 changed files with 0 additions and 3 deletions
--- 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>
 );