solve conflict

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>
 );