From 6b20524a5f3064a213077038caf3df00a932622c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BF=97=E9=92=A6?= <12345678@qq.com>
Date: Wed, 16 Mar 2022 09:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'src/lang/i18n/zh/module/b?=
 =?UTF-8?q?asicData.js'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/i18n/zh/module/basicData.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js
index a0a9c68..341d5ab 100644
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,15 +1,9 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
  * @LastEditors: fzq
  * @LastEditTime: 2022-03-15 18:33:24
  * @Description: file content
-=======
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 10:16:52
->>>>>>> develop
- */
 export default {
   visual: {
     addNow: '请先完成当前点位添加！',