diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-24 12:12:27 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-24 12:12:27 -0700 |
commit | 8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360 (patch) | |
tree | b961f87c1bd9a2428eaee8b5ebd8c9fd1baf0fcc /api/import.go | |
parent | a374419ad5c5f35174ee6285b4eaa57ef82235bd (diff) | |
parent | caa157a3774ee86f0e7003ef4debc49bd88cb9f0 (diff) | |
download | chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.gz chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.bz2 chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.zip |
Fixing merge
Diffstat (limited to 'api/import.go')
-rw-r--r-- | api/import.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/api/import.go b/api/import.go index e3f314d20..c465825b4 100644 --- a/api/import.go +++ b/api/import.go @@ -6,7 +6,6 @@ package api import ( l4g "code.google.com/p/log4go" "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" ) // @@ -24,9 +23,6 @@ func ImportPost(post *model.Post) { func ImportUser(user *model.User) *model.User { user.MakeNonNil() - if len(user.Props["theme"]) == 0 { - user.AddProp("theme", utils.Cfg.TeamSettings.DefaultThemeColor) - } if result := <-Srv.Store.User().Save(user); result.Err != nil { l4g.Error("Error saving user. err=%v", result.Err) |