Merge branch 'branch2'

# Conflicts: # 1.txt
branch2
1 changed files with 5 additions and 0 deletions
--- a/1.txt
+++ b/1.txt
@ -1,2 +1,7 @@
 42120412
 branch1
+<<<<<<< HEAD
+branch2
+=======
+branch2
+>>>>>>> branch2
Author	SHA1	Message	Date
HeQiJin	24a5aefdc2	Merge branch 'branch2' # Conflicts: # 1.txt	1 year ago
HeQiJin	4c62162bcc	branch2	1 year ago
HeQiJin	5633899b1d	Merge branch 'branch2' # Conflicts: # 1.txt	1 year ago
HeQiJin	b63e544895	branch2	1 year ago