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 = {}