Merge branch 'branch2'

# Conflicts: # 1.txt
8 months ago · 24a5aefdc2
parent 5633899b1d 4c62162bcc
commit 24a5aefdc2
1 changed files with 5 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,3 +1,7 @@
 42120412
 branch1
+<<<<<<< HEAD
 branch2
+=======
+branch2
+>>>>>>> branch2