fix

2016-12-18 21:12:34 -05:00
parent e21e9055b1 c6a7f18e1e
commit 5aaaaf8e43
1 changed files with 3 additions and 0 deletions
--- a/_config.yml
+++ b/_config.yml
@@ -5,7 +5,10 @@ gems: [jekyll-paginate]
 paginate: 7
 paginate_path: "page:num"
 layout: post
+<<<<<<< HEAD
 #permalink: /:categories/:title
+=======
+>>>>>>> c6a7f18e1ea48b44859aaeca0db0980c68c09690
 permalink: pretty
 excerpt_separator: "[-----]"