From a0432ca461ebe573856dfc82b63804b6432a55cb Mon Sep 17 00:00:00 2001
From: "Roy.Liu" <Roy.Liu@fanruan.com>
Date: Thu, 24 Dec 2020 15:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/index.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/typescript/index.ts b/typescript/index.ts
index b4e5a14dd..75e811f3a 100644
--- a/typescript/index.ts
+++ b/typescript/index.ts
@@ -141,12 +141,9 @@ import { EditorIconCheckCombo } from "./case/combo/editoriconcheckcombo/combo.ed
 import { IconTextValueCombo } from './case/combo/icontextvaluecombo/combo.icontextvalue';
 import { ListView } from './base/list/listview';
 import { FloatCenterLayout } from './core/wrapper/layout/middle/middle.float.center';
-<<<<<<< HEAD
 import { _msg } from './base/foundation/message';
 import { _web } from './core/platform/web';
-=======
 import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth';
->>>>>>> 6719cf4a69338c554f8e06c51d91a74c6b66e71e
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -303,11 +300,8 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web {
     IconTextValueCombo: typeof IconTextValueCombo;
     ListView: typeof ListView;
     FloatCenterLayout: typeof FloatCenterLayout;
-<<<<<<< HEAD
     Msg: _msg;
-=======
     DynamicYearMonthPopup: typeof DynamicYearMonthPopup;
->>>>>>> 6719cf4a69338c554f8e06c51d91a74c6b66e71e
 }
 
 export default {