mirror of
https://github.com/cwinfo/matterbridge.git
synced 2025-07-05 10:34:05 +00:00
Update dependencies (#1610)
* Update dependencies * Update module to go 1.17
This commit is contained in:
5
vendor/github.com/mattermost/mattermost-server/v5/model/preferences.go
generated
vendored
5
vendor/github.com/mattermost/mattermost-server/v5/model/preferences.go
generated
vendored
@ -19,9 +19,8 @@ func PreferencesFromJson(data io.Reader) (Preferences, error) {
|
||||
decoder := json.NewDecoder(data)
|
||||
var o Preferences
|
||||
err := decoder.Decode(&o)
|
||||
if err == nil {
|
||||
return o, nil
|
||||
} else {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return o, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user