branch2

1 changed files with 1 additions and 3 deletions
--- a/1.txt
+++ b/1.txt
@ -1,5 +1,3 @@
 2067809724
 branch1
-branch2
-产生冲突
-冲突
+branch2