1.txt修改

2 months ago · a99e270b11
parent 379b2dcba6
commit a99e270b11
1 changed files with 5 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,2 +1,6 @@
+<<<<<<< HEAD
 111
-branch1
+branch1
+=======
+111
+>>>>>>> c00de31092a7080c232bf18df5101a99e9f0c791