Merge branch 'branch1'

# Conflicts: # 1.txt
2 months ago · 1396bc2aa5
parent ac523b5409 feae6ee8aa
commit 1396bc2aa5
1 changed files with 7 additions and 0 deletions
--- a/1.txt
+++ b/1.txt
@ -0,0 +1,7 @@
+<<<<<<< .mine
+
+
+=======
+111
+branch1
+>>>>>>> .theirs