Merge branch 'master' of http://gitea.xinje.cc/wangshunkui/kong

# Conflicts: # 3.txt
888
--- a/3.txt
+++ b/3.txt
@@ -1 +1,5 @@
 4444444555666777
 <<<<<<< HEAD
 4444444555666777888
 =======
 4444444555666777
 >>>>>>> 1c31fc651a1b01953ad1b4e406479fa61546a2de
作成者	SHA1	メッセージ	日付
wsk	f26c6560b7	Merge branch 'master' of http://gitea.xinje.cc/wangshunkui/kong # Conflicts: # 3.txt	2日前
wsk	aa2c14e3b0	888	2日前