Merge branch 'dev1.1'

# Conflicts: # 4.txt
添加内容：5555
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
 1.txt
--- a/1.txt
+++ b/1.txt
@@ -1 +1 @@
 1111 2222
 1111 2222
--- a/2.txt
+++ b/2.txt
@@ -1 +1 @@
 abc def
 abc def
--- a/3.txt
+++ b/3.txt
@@ -0,0 +1 @@
 3333
--- a/4.txt
+++ b/4.txt
@@ -0,0 +1 @@
 5555
Author	SHA1	Message	Date
“xinle”	2cda6b3cb7	Merge branch 'dev1.1' # Conflicts: # 4.txt	3 years ago
“xinle”	46fbf3dde8	添加内容：5555	3 years ago
“xinle”	74c657b775	添加文件：4.txt	3 years ago
“xinle”	d7b7c6d06f	添加内容：4444	3 years ago
“xinle”	c4ce1e3d34	添加文件：4.txt	3 years ago
“xinle”	1ecb377a92	3	3 years ago
“xinle”	a49cfa3c4f	Revert "移出文件3" This reverts commit `b34decce2a`.	3 years ago
“xinle”	b34decce2a	移出文件3	3 years ago
“xinle”	16d6fa7943	添加文件：3.txt	3 years ago
“xinle”	0544b44f58	添加内容：换行符	3 years ago
“xinle”	25ef87d953	添加文件：添加忽略文件	3 years ago