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
+2 -2
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 #### 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...] [...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: 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. 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.