Fixing merge conflict

2015-09-22 13:20:24 -07:00
--- a/config/config.json
+++ b/config/config.json
@@ -5,8 +5,8 @@
        "SegmentDeveloperKey": "",
        "GoogleDeveloperKey": "",
        "EnableOAuthServiceProvider": false,
-        "EnableTesting": false,
-        "EnableIncomingWebhooks": false
+        "EnableIncomingWebhooks": false,
+        "EnableTesting": false
    },
    "TeamSettings": {
        "SiteName": "Mattermost",
--- 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",
--- a/model/config.go
+++ b/model/config.go
@@ -25,8 +25,8 @@ type ServiceSettings struct {
 	SegmentDeveloperKey        string
 	GoogleDeveloperKey         string
 	EnableOAuthServiceProvider bool
-	EnableTesting              bool
 	EnableIncomingWebhooks     bool
+	EnableTesting              bool
 }

 type SSOSettings struct {