Merge branch 'branch1'

# Conflicts: # 1.txt
test
1 changed files with 5 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,2 +1,6 @@
+<<<<<<< HEAD
+text1
+=======
 test
-branch1
+branch1
+>>>>>>> branch1
Author	SHA1	Message	Date
3702M	5772989540	Merge branch 'branch1' # Conflicts: # 1.txt	11 months ago
3702M	83974aa674	test	11 months ago