master
Ubuntu 2016-12-18 21:12:34 -05:00
commit 5aaaaf8e43
1 changed files with 3 additions and 0 deletions

View File

@ -5,7 +5,10 @@ gems: [jekyll-paginate]
paginate: 7 paginate: 7
paginate_path: "page:num" paginate_path: "page:num"
layout: post layout: post
<<<<<<< HEAD
#permalink: /:categories/:title #permalink: /:categories/:title
=======
>>>>>>> c6a7f18e1ea48b44859aaeca0db0980c68c09690
permalink: pretty permalink: pretty
excerpt_separator: "[-----]" excerpt_separator: "[-----]"