From f286ac9fb3bbffa0d3468fde8d5c6b776a5654e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BF=9E=20=E4=BD=B3=E5=90=9B?=
 <yuyokun@yumatoMacBook-Air.local>
Date: Thu, 26 Jan 2017 09:53:54 +0800
Subject: [PATCH] hello git

---
 readme.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index e256516..47de9e1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,7 @@
 //1.git版本库，把文件添加到版本库
 第一次修改
 
-合并分之冲突解决
\ No newline at end of file
+
+合并分之冲突解决
+
+hello git