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

# Conflicts: # 1.txt
本地
--- a/1.txt
+++ b/1.txt
@@ -1,2 +1,2 @@
 qfvercsadaada
 远程
 本地
Autore	SHA1	Messaggio	Data
1923777848	8deaa2e001	Merge branch 'master' of http://gitea.xinje.cc/zhangcheng2/rgew # Conflicts: # 1.txt	1 giorno fa
1923777848	65851fc28b	本地	1 giorno fa