1

Merge branch 'branch1'
# Conflicts: # 1.txt
1 changed files with 3 additions and 2 deletions
--- a/1.txt
+++ b/1.txt
@ -1,4 +1,5 @@
-111
+111master1
 branch1
 branch2
 pull request
 222
Author	SHA1	Message	Date
cxn	6666c075fa	1	1 year ago
cxn	a129b23b5f	Merge branch 'branch1' # Conflicts: # 1.txt	1 year ago
cxn	ac2f6a365c	branch1	1 year ago
cxn	d565e97d59	master	1 year ago