Merge pull request #766 from zlQhs/master

s
shenxiuqiang · Oct 12, 2015 · 2d2bd26 · 2d2bd26
2 parents 4e43bcc + 444d1fc
commit 2d2bd26
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/haha.txt b/haha.txt
@@ -0,0 +1 @@
+this is a test!
diff --git a/hao.txt b/hao.txt
@@ -1 +1 @@
-think you  liao teacher
+think you  liao teacher  ff
diff --git a/okk.txt b/okk.txt
@@ -0,0 +1 @@
+okk
diff --git a/thxliao.txt b/thxliao.txt
@@ -0,0 +1 @@
+thxliao!