From 3de4e4a5d82be12028f8a6fd8f0518b2af2e01f7 Mon Sep 17 00:00:00 2001
From: clj <474691391@qq.com>
Date: Mon, 28 Aug 2017 15:43:40 +0800
Subject: [PATCH] conflict feature1

---
 readme.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.txt b/readme.txt
index 624c86d..e94ad6d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,3 +2,5 @@ Git is a distributed version control system.
 Git is free software distributed under the GPL..
 
 Creating a new branch is quick
+
+conflict feature1