From c9d710c3bb1ea49d14d7fdfb44a1848fcdb5a9a0 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Wed, 9 Nov 2022 17:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/basicConfig.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 1cc935bd..a6304c0f 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -1,13 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
-<<<<<<< HEAD
- * @LastEditors: Light
- * @LastEditTime: 2022-10-31 18:59:19
-=======
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-27 16:04:46
->>>>>>> hi-ucs-dev
+ * @LastEditTime: 2022-11-09 17:06:33
  * @Description: 系统静态参数配置
  */
 var _global = {}