2 changed files with 1 additions and 5 deletions
--- a/cmc.txt
+++ b/cmc.txt
@ -1,5 +0,0 @@
-<<<<<<< HEAD
-nihao!!
-=======
-123456
->>>>>>> 7f0713c0cf34d60e728087da8ecc86268339b486
--- a/新建文本文档.txt
+++ b/新建文本文档.txt
@ -0,0 +1 @@
+123456