Merge branch 'branch1'

# Conflicts: # 1.txt
8 months ago · 5772989540
parent 83974aa674 4ee310040f
commit 5772989540
1 changed files with 6 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1 +1,6 @@
-text1
+<<<<<<< HEAD
+text1
+=======
+test
+branch1
+>>>>>>> branch1