From afbd054e7e8da3b36027a52721557710805eddb9 Mon Sep 17 00:00:00 2001 From: ryou62525 Date: Mon, 31 Jul 2017 17:05:54 +0900 Subject: [PATCH] update to file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 78871dd..bfef6c1 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Lastly we initiate a pull request to the origin blessed repository using the `Pu First Conflict -------------- Here we will help you face and resolve a git conflict by trying to simulate the situation. We have the following -sentence `She sells sea-shells on the sea-shore.`. What we will do is modify this sentence to contain `by the seashore` +sentence `She sells sea-shells by the seashore. What we will do is modify this sentence to contain `by the seashore` as opposed to `on the sea-shore`. #### Branch