diff --git a/common/store/index.js b/common/store/index.js
index 7224a62..e07af85 100644
--- a/common/store/index.js
+++ b/common/store/index.js
@@ -2,11 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 18:28:52
  * @LastEditors: ch
-<<<<<<< HEAD
- * @LastEditTime: 2022-04-29 14:03:32
-=======
- * @LastEditTime: 2022-04-28 23:03:06
->>>>>>> feature/1.0.0_im_ch
+ * @LastEditTime: 2022-04-29 14:13:05
  * @Description: file content
  */
 import Vue from 'vue'
diff --git a/main.js b/main.js
index 105b250..95ba842 100644
--- a/main.js
+++ b/main.js
@@ -2,11 +2,7 @@
  * @Author: ch
  * @Date: 2021-07-26 23:22:16
  * @LastEditors: ch
-<<<<<<< HEAD
- * @LastEditTime: 2022-04-29 14:02:40
-=======
- * @LastEditTime: 2022-04-27 10:12:54
->>>>>>> feature/1.0.0_im_ch
+ * @LastEditTime: 2022-04-29 14:13:08
  * @Description: file content
  */
 import Vue from 'vue';