Merge branch 'master' of http://gitea.xinje.cc/luyingying/test

# Conflicts: # 7.txt
1.删除6文件
--- a/6.txt
+++ b/6.txt
--- a/7.txt
+++ b/7.txt
@@ -1 +1,2 @@
 1111
 2222
Author	SHA1	Message	Date
Yingying Lu	420fe4f8e4	Merge branch 'master' of http://gitea.xinje.cc/luyingying/test # Conflicts: # 7.txt	1 year ago
Yingying Lu	08707db742	1.删除6文件	1 year ago
Yingying Lu	a569427386	1.新增空白7文件	1 year ago