update overridden config for 1.10 (#7847)

* update overridden config for 1.10

* fix config file per comments

Author: Bradamant3

_config.yml

@@ -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: