2022-03-16 09:55:56 +08:00
1 changed files with 0 additions and 5 deletions
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@ -1,13 +1,8 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
 * @LastEditors: fzq
 * @LastEditTime: 2022-03-15 18:33:48
-=======
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 10:17:01
->>>>>>> develop
 * @Description: file content
 */
 export default {