branch1

11 months ago · a13e25c2a5
parent bd93e3a869
commit a13e25c2a5
1 changed files with 1 additions and 5 deletions
--- a/1.txt
+++ b/1.txt
@ -1,8 +1,4 @@
 42120412
 branch1
-<<<<<<< HEAD
 branch2
-=======
-branch2
->>>>>>> branch2
-pull
+