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 /config/config.json | |
| parent | 6e60768abe6f0caa639febf068d718d62881ce62 (diff) | |
| download | chat-554f0173270a3d66dd28f0f4cccb09d870d3e5f0.tar.gz chat-554f0173270a3d66dd28f0f4cccb09d870d3e5f0.tar.bz2 chat-554f0173270a3d66dd28f0f4cccb09d870d3e5f0.zip | |
Fixing merge conflict
Diffstat (limited to 'config/config.json')
| -rw-r--r-- | config/config.json | 4 |
1 files changed, 2 insertions, 2 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", |