diff options
| author | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
|---|---|---|
| committer | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
| commit | 964d0262ff353db6a50ed5be83ebd22f71aa6e69 (patch) | |
| tree | 8cbab6b6a9b4f62cbe9acb2a0b8752b531633362 /modules/base/template.go | |
| parent | 079a2d68db5c843ef2dbba65aeca46d5887d6b02 (diff) | |
| parent | b75d0378cbbf0523963fd9bc749543244be7392b (diff) | |
Merged conflicts.
Diffstat (limited to 'modules/base/template.go')
| -rw-r--r-- | modules/base/template.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/base/template.go b/modules/base/template.go index 7875010d..6fc449a6 100644 --- a/modules/base/template.go +++ b/modules/base/template.go @@ -76,9 +76,8 @@ func ToUtf8WithErr(content []byte) (error, string) { } encoding, _ := charset.Lookup(charsetLabel) - if encoding == nil { - return fmt.Errorf("unknow char decoder %s", charsetLabel), string(content) + return fmt.Errorf("unknown char decoder %s", charsetLabel), string(content) } result, n, err := transform.String(encoding.NewDecoder(), string(content)) |