whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update overridden config for 1.10 (#7847)

Browse Source 
* update overridden config for 1.10

* fix config file per comments
This commit is contained in:
Jennifer Rondeau
2018-03-26 15:09:03 -04:00
committed by zacharysarah
parent 3b3ef25cca
commit 83efd2a38d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_config.yml
+6
View File
@@ -13,6 +13,7 @@ incremental: true
safe: false safe: false
lsi: false lsi: false
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
latest: "v1.10" latest: "v1.10"
@@ -23,6 +24,11 @@ paginate_path: "/blog/page:num/"
======= =======
latest: "v1.9" latest: "v1.9"
>>>>>>> merge master to 1.10, with fixes (#7682) >>>>>>> merge master to 1.10, with fixes (#7682)
||||||| merged common ancestors
latest: "v1.9"
=======
latest: "v1.10"
>>>>>>> update overridden config for 1.10 (#7847)
defaults: defaults:
- -
scope: scope: