Merge remote-tracking branch 'origin/master'

Conflicts: README.md
RunningStudent · Sep 25, 2015 · c592123 · c592123
2 parents 2398e23 + b41c5ff
commit c592123
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
 
 ###学习C#所写的代码,无任何意义
 
-####顺便测试GIT
+出现冲突后,在本地会把冲突的那行删去,并生成出两个文件不同的地方