diff --git a/src/index.js b/src/index.js
index 1b93bdd..46b1b61 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,7 +2,11 @@
  * Author       : OBKoro1
  * Date         : 2019-12-19 20:23:57
  * LastEditors  : OBKoro1
- * LastEditTime : 2019-12-20 15:36:23
+<<<<<<< HEAD
+ * LastEditTime : 2019-12-20 15:36:46
+=======
+ * LastEditTime : 2019-12-20 11:38:56
+>>>>>>> f3727103e7de14f2c3f815eacd27eb642b0b7682
  * FilePath     : /autoCommit/index.js
  * Description  : 自动commit
  * https://github.com/OBKoro1
diff --git a/test.md b/test.md
index 377f32f..b6dc2ab 100644
--- a/test.md
+++ b/test.md
@@ -1 +1 @@
-20/12/2019 15:12:29
\ No newline at end of file
+20/12/2019 15:12:29