From 554f0173270a3d66dd28f0f4cccb09d870d3e5f0 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 22 Sep 2015 13:20:24 -0700
Subject: Fixing merge conflict

---
 docker/dev/config_docker.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docker/dev/config_docker.json')

diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index 4a1be4ed3..e33396214 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -5,8 +5,8 @@
         "SegmentDeveloperKey": "",
         "GoogleDeveloperKey": "",
         "EnableOAuthServiceProvider": false,
-        "EnableTesting": false,
-        "EnableIncomingWebhooks": false
+        "EnableIncomingWebhooks": false,
+        "EnableTesting": false
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
-- 
cgit v1.2.3-1-g7c22