From 0c8968fb8df4ce302c928118cd81e75f5bef2861 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Tue, 30 Jan 2018 17:23:00 -0600
Subject: unnamed return (#8170)

---
 model/preference.go | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'model/preference.go')

diff --git a/model/preference.go b/model/preference.go
index 5d462de8b..dc97314c5 100644
--- a/model/preference.go
+++ b/model/preference.go
@@ -47,23 +47,14 @@ type Preference struct {
 }
 
 func (o *Preference) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(o)
+	return string(b)
 }
 
 func PreferenceFromJson(data io.Reader) *Preference {
-	decoder := json.NewDecoder(data)
-	var o Preference
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o
-	} else {
-		return nil
-	}
+	var o *Preference
+	json.NewDecoder(data).Decode(&o)
+	return o
 }
 
 func (o *Preference) IsValid() *AppError {
-- 
cgit v1.2.3-1-g7c22