111

1 changed files with 1 additions and 6 deletions
--- a/1.txt
+++ b/1.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 111
-branch1
-=======
-111
->>>>>>> e6f58e78a1f9d84f2d54a392f6c132c137a6a0f4