Merge branch 'branch1'

# Conflicts: # 1.txt
7 months ago · 46e5dc80b3
parent 203a9ba7ff 6f99853a0f
commit 46e5dc80b3
1 changed files with 5 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1 +1,5 @@
-222
+<<<<<<< HEAD
+222
+=======
+b1
+>>>>>>> branch1