From 5641988f717ca39172057022b3f1faa8508169bb Mon Sep 17 00:00:00 2001 From: tangyefei Date: Wed, 12 Aug 2015 15:13:31 +0800 Subject: [PATCH 1/2] try to cause conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8db6de6..0338b80 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# test-pull-request readme +# test-pull-request another-f-o-r-k readme add some decrition in forked version \ No newline at end of file From 4a50ae465620ff070f15eb08329f8fb032fd8ff3 Mon Sep 17 00:00:00 2001 From: tangyefei Date: Wed, 12 Aug 2015 15:24:48 +0800 Subject: [PATCH 2/2] c --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0338b80..06e4693 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# test-pull-request another-f-o-r-k readme +# test-pull-request work-please-this-time readme add some decrition in forked version \ No newline at end of file