From 2046c41b0abb2297547dd0cb19a921325af87673 Mon Sep 17 00:00:00 2001
From: cuilijin <davidclj@gmail.com>
Date: Wed, 7 Jun 2017 18:54:43 +0800
Subject: [PATCH] Merge branch 'master' into test_005

# Conflicts:
#	test01.txt
---
 test02.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test02.txt b/test02.txt
index 367b71a..40e032e 100644
--- a/test02.txt
+++ b/test02.txt
@@ -1,7 +1,7 @@
 test02
 test02
 test02
-test02
+test02  a_02 add
 test02
 test02
 test02
-- 
Gitee