Merge branch 'branch1'

# Conflicts: # 1.txt.txt
branch1
1 changed files with 3 additions and 2 deletions
--- a/1.txt.txt
+++ b/1.txt.txt
@ -1,4 +1,5 @@
-111
+111master
 branch1
 branch2
 pullrequest
 222
Author	SHA1	Message	Date
administrator	36965e6fee	Merge branch 'branch1' # Conflicts: # 1.txt.txt	1 year ago
administrator	d9148995fb	branch1 222	1 year ago
administrator	f45230b68b	master	1 year ago