Merge branch 'master' of http://gitea.xinje.cc/zhangcheng2/Test1

# Conflicts: # 3.txt
3
--- a/3.txt
+++ b/3.txt
@@ -1,3 +1,4 @@
 wvrgwr
 bsfbbr
 dhrtet


 本地
Author	SHA1	Message	Date
1923777848	f5410ba889	Merge branch 'master' of http://gitea.xinje.cc/zhangcheng2/Test1 # Conflicts: # 3.txt	1 day ago
1923777848	eea8e927a2	3	1 day ago