no message

Merge branch '1'
# Conflicts: # Gitlearn.txt
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
 Gitlearn.txt
--- a/Gitlearn.txt
+++ b/Gitlearn.txt
@@ -1,4 +0,0 @@
 第一次提交尝试
 22222
 33333
Author	SHA1	Message	Date
jjl	7bba60de01	no message	4 days ago
jjl	9aa888bcf2	Merge branch '1' # Conflicts: # Gitlearn.txt	4 days ago
jjl	c8e1426854	no message	4 days ago
jjl	3122f4dbcf	no message	4 days ago