From 554f0173270a3d66dd28f0f4cccb09d870d3e5f0 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 22 Sep 2015 13:20:24 -0700 Subject: Fixing merge conflict --- config/config.json | 4 ++-- docker/dev/config_docker.json | 4 ++-- docker/local/config_docker.json | 4 ++-- model/config.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/config.json b/config/config.json index e055fd845..c0f33a346 100644 --- 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", 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", diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index 4a1be4ed3..e33396214 100644 --- 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", diff --git a/model/config.go b/model/config.go index 76d449904..1e95277a2 100644 --- 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 { -- cgit v1.2.3-1-g7c22