Fixing merge conflict

2015-09-22 13:20:24 -07:00
--- 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",
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -5,8 +5,8 @@
        "SegmentDeveloperKey": "",
        "GoogleDeveloperKey": "",
        "EnableOAuthServiceProvider": false,
-        "EnableTesting": false,
-        "EnableIncomingWebhooks": false
+        "EnableIncomingWebhooks": false,
+        "EnableTesting": false
    },
    "TeamSettings": {
        "SiteName": "Mattermost",