Puqns67/serenity
1
0
Fork 0
forked from mirror/serenity
Code Issues Pull Requests Packages Activity

Fix merge template

Browse Source
This commit is contained in:
世界 2024-05-12 13:30:16 +08:00
parent 76e13570a2
commit 93b18d7037
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
template/manager.go
View File

@ -40,7 +40,7 @@ func extendTemplate(rawTemplates []option.Template, root, current option.Templat
} }
next = newNext next = newNext
} }
newTemplate, err := badjson.Merge(current, next) newTemplate, err := badjson.Merge(next, current)
if err != nil { if err != nil {
return option.Template{}, E.Cause(err, "initialize template[", current.Name, "]: merge extended template: ", current.Extend) return option.Template{}, E.Cause(err, "initialize template[", current.Name, "]: merge extended template: ", current.Extend)
} }