diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:20:24 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:20:24 -0700 |
commit | 554f0173270a3d66dd28f0f4cccb09d870d3e5f0 (patch) | |
tree | fc17b78542a5089a0eabf861f6efef90fe8b0630 | |
parent | 6e60768abe6f0caa639febf068d718d62881ce62 (diff) | |
download | chat-554f0173270a3d66dd28f0f4cccb09d870d3e5f0.tar.gz chat-554f0173270a3d66dd28f0f4cccb09d870d3e5f0.tar.bz2 chat-554f0173270a3d66dd28f0f4cccb09d870d3e5f0.zip |
Fixing merge conflict
-rw-r--r-- | config/config.json | 4 | ||||
-rw-r--r-- | docker/dev/config_docker.json | 4 | ||||
-rw-r--r-- | docker/local/config_docker.json | 4 | ||||
-rw-r--r-- | 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 { |