From 83efd2a38d39f648eff6e5e480f746385397c781 Mon Sep 17 00:00:00 2001
From: Jennifer Rondeau <Bradamant3@users.noreply.github.com>
Date: Mon, 26 Mar 2018 15:09:03 -0400
Subject: [PATCH] update overridden config for 1.10 (#7847)

* update overridden config for 1.10

* fix config file per comments
---
 _config.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/_config.yml b/_config.yml
index 4a675c259d..329d4a4092 100644
--- a/_config.yml
+++ b/_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: