myfile1

8 months ago · 791f0ddc42
parent 64c8f978cb
commit 791f0ddc42
2 changed files with 5 additions and 5 deletions
--- a/111.txt
+++ b/111.txt
@ -0,0 +1,5 @@
+<<<<<<< HEAD
+nihao!!
+=======
+123456
+>>>>>>> 7f0713c0cf34d60e728087da8ecc86268339b486
--- a/cmc.txt
+++ b/cmc.txt
@ -1,5 +0,0 @@
-<<<<<<< HEAD
-nihao!!
-=======
-123456
->>>>>>> 7f0713c0cf34d60e728087da8ecc86268339b486