no message

Merge branch '2'
# Conflicts: # 1.txt
--- a/1.txt
+++ b/1.txt
@@ -1,4 +1,3 @@
 1111
 2222
 5555
 远程修改
 5555
Author	SHA1	Message	Date
1923777848	d9056c7963	no message	2 days ago
1923777848	cb2bbcf875	Merge branch '2' # Conflicts: # 1.txt	2 days ago
1923777848	d09047caf1	no message	2 days ago
1923777848	40e8fa3173	no message	2 days ago