合并branch1

b
1 changed files with 2 additions and 0 deletions
--- a/1.txt
+++ b/1.txt
@ -0,0 +1,2 @@
+主分支
+branch1 继续修改
Author	SHA1	Message	Date
mz5mcgohu	01de83a710	合并branch1 合并branch1	2 weeks ago
ss	70dd580a5f	b	2 weeks ago