Merge pull request #4434 from chris72205/master

fix broken link to CONDUCT.markdown in README.markdown
This commit is contained in:
Parker Moore 2016-02-01 14:21:48 -08:00
commit a820f8d9c8
1 changed files with 1 additions and 1 deletions

View File

@ -37,7 +37,7 @@ See: http://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011
## Code of Conduct
In order to have a more open and welcoming community, Jekyll adheres to a
[code of conduct](CONDUCT.md) adapted from the Ruby on Rails code of
[code of conduct](CONDUCT.markdown) adapted from the Ruby on Rails code of
conduct.
Please adhere to this code of conduct in any interactions you have in the