1 changed files with 0 additions and 5 deletions
--- a/1.txt
+++ b/1.txt
@ -1,7 +1,2 @@
 42120412
 branch1
-<<<<<<< HEAD
-branch2
-=======
-branch2
->>>>>>> branch2