diff options
Diffstat (limited to 'app/slackimport.go')
| -rw-r--r-- | app/slackimport.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/slackimport.go b/app/slackimport.go index edeb601e2..3289f140e 100644 --- a/app/slackimport.go +++ b/app/slackimport.go @@ -472,7 +472,7 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str newChannel = SlackSanitiseChannelProperties(newChannel) var mChannel *model.Channel - if result := <-Srv.Store.Channel().GetByName(teamId, sChannel.Name); result.Err == nil { + if result := <-Srv.Store.Channel().GetByName(teamId, sChannel.Name, true); result.Err == nil { // The channel already exists as an active channel. Merge with the existing one. mChannel = result.Data.(*model.Channel) log.WriteString(utils.T("api.slackimport.slack_add_channels.merge", map[string]interface{}{"DisplayName": newChannel.DisplayName})) |