conflicts: - site/_posts/2012-07-01-permalinks.md - site/css/style.css - site/index.html |
||
---|---|---|
.. | ||
gridism.css | ||
normalize.css | ||
pygments.css | ||
style.css |
conflicts: - site/_posts/2012-07-01-permalinks.md - site/css/style.css - site/index.html |
||
---|---|---|
.. | ||
gridism.css | ||
normalize.css | ||
pygments.css | ||
style.css |