branch1

8 months ago · b29d40710e
parent 1f7f2e60a8
commit b29d40710e
1 changed files with 5 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,2 +1,6 @@
+<<<<<<< HEAD
 111
-branch1
+branch1
+=======
+111
+>>>>>>> e6f58e78a1f9d84f2d54a392f6c132c137a6a0f4