合并branch2

4 months ago · 2f6327b6e6
parent ad0ac4f11e 361c47cf78
commit 2f6327b6e6
1 changed files with 2 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,2 +1,3 @@
 111
-branch1
+branch1
+branch2