Skip to content

Commit

Permalink
Fix merge template
Browse files Browse the repository at this point in the history
  • Loading branch information
nekohasekai committed May 12, 2024
1 parent 76e1357 commit 93b18d7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion template/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func extendTemplate(rawTemplates []option.Template, root, current option.Templat
}
next = newNext
}
newTemplate, err := badjson.Merge(current, next)
newTemplate, err := badjson.Merge(next, current)
if err != nil {
return option.Template{}, E.Cause(err, "initialize template[", current.Name, "]: merge extended template: ", current.Extend)
}
Expand Down

0 comments on commit 93b18d7

Please sign in to comment.