Merge branch 'branch1'

# Conflicts: # branch1.txt
9 months ago · 1852f39b8c
parent 02931a7d16 3918a160dd
commit 1852f39b8c
1 changed files with 4 additions and 0 deletions
--- a/branch1.txt
+++ b/branch1.txt
@ -1,2 +1,6 @@
 branch1
+<<<<<<< HEAD
 master1
+=======
+第二次修改branch1
+>>>>>>> branch1