Merge branch 'branch2'

# Conflicts: # 1.txt
8 months ago · 5633899b1d
parent 084d9b3c71 b63e544895
commit 5633899b1d
1 changed files with 1 additions and 0 deletions
--- a/1.txt
+++ b/1.txt
@ -1,2 +1,3 @@
 42120412
 branch1
+branch2