Merge branch '2_branch'

# Conflicts: # hello git.txt
5 months ago · 6731c15a2d
parent 508d38ddc6 ed55d5a76f
commit 6731c15a2d
1 changed files with 4 additions and 0 deletions
--- a/git.txt
+++ b/git.txt
@ -1 +1,5 @@
+<<<<<<< HEAD
 1版本
+=======
+2版本
+>>>>>>> 2_branch