Merge branch 'master' of 192.168.199.100:/var/git/desktop/test

575cd173 · 陈创杰 · 4e12add6 · 446a0a02 · 575cd173 · 575cd173
Commit 575cd173 authored Mar 21, 2017 by 陈创杰
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

liangjingqiang2.txt liangjingqiang2.txt +4 -1

linyanghuan.txt linyanghuan.txt +1 -1

No files found.
--- a/liangjingqiang2.txt
+++ b/liangjingqiang2.txt
-My second file.
\ No newline at end of file
+My second file.
+
+
+Switch to branch LJQ.
\ No newline at end of file
--- a/linyanghuan.txt
+++ b/linyanghuan.txt
@@ -4,5 +4,5 @@ yes,it is best.

 change tow

-change 4
+change 6