haopengzhan/pengzhan.dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Joel Glovier
2015-07-23 14:00:24 -04:00
parent 099a503210
commit 7c57b766b8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -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...]