Skip to content

Commit

Permalink
Merge pull request #26 from LUSHDigital/danmrichards-unmarshal
Browse files Browse the repository at this point in the history
danmrichards-unmarshal
ladydascalie authored Jul 13, 2018
2 parents e49a8f5 + 977f133 commit deae549
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion main-packr.go

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion tmpl/x_helpers.html
Original file line number Diff line number Diff line change
@@ -332,7 +332,9 @@
// UnmarshalJSON for NullString
func (n *RawJSON) UnmarshalJSON(b []byte) error {
var a json.RawMessage
json.Unmarshal(b, &a)
if err := json.Unmarshal(b, &a); err != nil {
return err
}
c := RawJSON(a)
*n = c
return nil

0 comments on commit deae549

Please sign in to comment.