From b41c5ff4a4c942ea94f3ee8ac32c63e6a071b293 Mon Sep 17 00:00:00 2001
From: RunningStudent <378280323@qq.com>
Date: Fri, 25 Sep 2015 15:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 17910e3..c50fdf4 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
 
 ###学习C#所写的代码,无任何意义
+
+####测试下两边是否有冲突