diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-19 11:42:40 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-19 11:42:40 -0700 |
| commit | 36658c13a4c7ebdfff22b8570e0db52bfa4de000 (patch) | |
| tree | dc27373b42b8fe2a5f8ae88191924f27c361afb6 /utils | |
| parent | 097d17bf2c4e07a153beb80afb15a546f291a418 (diff) | |
| parent | d139c9e825d0149329d90684ebe2d6b31a728b16 (diff) | |
| download | chat-36658c13a4c7ebdfff22b8570e0db52bfa4de000.tar.gz chat-36658c13a4c7ebdfff22b8570e0db52bfa4de000.tar.bz2 chat-36658c13a4c7ebdfff22b8570e0db52bfa4de000.zip | |
Fixing merge conflicts
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 6a0cd0971..c1e3a8d2a 100644 --- a/utils/config.go +++ b/utils/config.go @@ -188,6 +188,7 @@ func getClientConfig(c *model.Config) map[string]string { props["SegmentDeveloperKey"] = c.ServiceSettings.SegmentDeveloperKey props["GoogleDeveloperKey"] = c.ServiceSettings.GoogleDeveloperKey props["EnableIncomingWebhooks"] = strconv.FormatBool(c.ServiceSettings.EnableIncomingWebhooks) + props["EnableOutgoingWebhooks"] = strconv.FormatBool(c.ServiceSettings.EnableOutgoingWebhooks) props["EnablePostUsernameOverride"] = strconv.FormatBool(c.ServiceSettings.EnablePostUsernameOverride) props["EnablePostIconOverride"] = strconv.FormatBool(c.ServiceSettings.EnablePostIconOverride) |