Merge branch '2_branch'

# Conflicts: # hello git.txt
Merge pull request '1版本修改' (#1 ) from 1_branch into master
1 changed files with 5 additions and 1 deletions
--- a/git.txt
+++ b/git.txt
@ -1 +1,5 @@
-123456
+<<<<<<< HEAD
+1版本
+=======
+2版本
+>>>>>>> 2_branch
Author	SHA1	Message	Date
white-yj8109	6731c15a2d	Merge branch '2_branch' # Conflicts: # hello git.txt	2 months ago
p6vxzahlf	508d38ddc6	Merge pull request '1版本修改' (#1 ) from 1_branch into master	2 months ago
white-yj8109	ed55d5a76f	2版本	2 months ago
white-yj8109	aeb6de752a	第一版本修改	2 months ago