diff options
author | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
commit | 7941c30117efe1b957ac0458c2f0479e3824196d (patch) | |
tree | df791632a9dc790a6f73dec53aae3ba919ebda63 /model/push_response.go | |
parent | e1cd64613591cf5a990442a69ebf188258bd0cb5 (diff) | |
parent | 034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff) | |
download | chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.gz chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.bz2 chat-7941c30117efe1b957ac0458c2f0479e3824196d.zip |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'model/push_response.go')
-rw-r--r-- | model/push_response.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/model/push_response.go b/model/push_response.go index 095986f3e..1434a2b11 100644 --- a/model/push_response.go +++ b/model/push_response.go @@ -38,11 +38,8 @@ func NewErrorPushResponse(message string) PushResponse { } func (me *PushResponse) ToJson() string { - if b, err := json.Marshal(me); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func PushResponseFromJson(data io.Reader) PushResponse { |