From db16ec323a9b34f4e77a219dde9f3480ddde02db Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 18 May 2022 14:58:44 +0800
Subject: [PATCH] solve conflict

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

diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js
index e123cd1..d59d092 100644
--- a/pc4mobx/organization/index.js
+++ b/pc4mobx/organization/index.js
@@ -10,11 +10,9 @@ import Sequence from "./components/sequence/Sequence";
 import Group from "./components/group/Group";
 import OfficeManage from "./components/office/officeManage";
 import CompanyExtend from "./components/company/CompanyExtend"
-<<<<<<< HEAD
 import BranchNumSetting from "./components/branchNumSetting"
-=======
 import Company from "./components/company/company";
->>>>>>> feature/cl
+
 import stores from "./stores";
 import "./style/index";