From 7c57b766b8c36171d5d812b4904a4b007885800e Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Thu, 23 Jul 2015 14:00:24 -0400 Subject: [PATCH] resolve conflict --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8c1d141..e78003e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ First you'll want to fork the repo to your own account. Then clone it locally an #### Options/configuration -Much Most of the basic customization will take place in the `/_config.yml` file. Here is a list of customizations available via `/_config.yml`: +Most of the basic customization will take place in the `/_config.yml` file. Here is a list of customizations available via `/_config.yml`: [...write these out...] @@ -61,4 +61,4 @@ If you spot a bug, or want to improve the code, or even make the dummy content b The code and styles are licensed under the MIT license. [See project license.](LICENSE) Obviously you should not use the content of this demo repo in your own resume. :wink: -Disclaimer: Use of Homer J. Simpson image and name used under [Fair Use](https://en.wikipedia.org/wiki/Fair_use) for educational purposes. Project license does not apply to use of this material. \ No newline at end of file +Disclaimer: Use of Homer J. Simpson image and name used under [Fair Use](https://en.wikipedia.org/wiki/Fair_use) for educational purposes. Project license does not apply to use of this material.