22

push
Merge branch 'branch2'
2 changed files with 3 additions and 1 deletions
--- a/doc/简历.docx
+++ b/doc/简历.docx
--- a/hh.txt
+++ b/hh.txt
@ -1,2 +1,4 @@
+branch13
 branch2
-12
+12
+
Author	SHA1	Message	Date
HRZ	4aab1c3484	22	1 day ago
HRZ	f5ea892de9	push	1 day ago
HRZ	aa7dbf3042	Merge branch 'branch2' # Conflicts: # hh.txt	1 day ago
HRZ	1775acb1f6	1	1 day ago
HRZ	f59c4bbe13	feat	2 days ago