update overridden config for 1.10 (#7847)

* update overridden config for 1.10 * fix config file per comments
2018-03-26 15:09:03 -04:00
parent 3b3ef25cca
commit 83efd2a38d
1 changed files with 6 additions and 0 deletions
@@ -13,6 +13,7 @@ incremental: true
 safe: false
 lsi: false

+<<<<<<< HEAD
 <<<<<<< HEAD
 latest: "v1.10"

@@ -23,6 +24,11 @@ paginate_path: "/blog/page:num/"
 =======
 latest: "v1.9"
 >>>>>>> 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:
  -
    scope: