Merge branch 'master' of http://gitea.xinje.cc/jiujialin/GitLearn2

no message
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
 1111.txt
--- a/2.txt
+++ b/2.txt
@@ -0,0 +1,5 @@
 2222
 3333
 4444
Autors	SHA1	Ziņojums	Datums
jjl	e53bce7807	Merge branch 'master' of http://gitea.xinje.cc/jiujialin/GitLearn2	pirms 4 dienas
jjl	ba3f9d87e5	no message	pirms 4 dienas
jjl	69545d379e	no message	pirms 4 dienas
jjl	0879977075	no message	pirms 4 dienas
jjl	033ad737b8	提交忽略文件	pirms 4 dienas
jjl	902bed7782	no message	pirms 4 dienas
jjl	06580271c7	添加内容6666做成补丁	pirms 4 dienas
jjl	034df2960c	no message	pirms 4 dienas
jjl	3cc5905e53	no message	pirms 4 dienas
jjl	2046e1cf19	no message	pirms 4 dienas
jjl	c0e8e66a80	no message	pirms 4 dienas
jjl	f947d2ffaf	no message	pirms 4 dienas