Merge branch 'branch1'

# Conflicts: # 1.txt
b1
1 changed files with 5 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1 +1,5 @@
-222
+<<<<<<< HEAD
+222
+=======
+b1
+>>>>>>> branch1
Author	SHA1	Message	Date
lyj	46e5dc80b3	Merge branch 'branch1' # Conflicts: # 1.txt	8 months ago
lyj	6f99853a0f	b1	8 months ago
lyj	203a9ba7ff	a	8 months ago