Skip to content

Commit 4a2bef6

Browse files
hhelmkenhhelmken
authored
Use different order of arguments for json merge (oapi-codegen#998)
1 parent 2198bea commit 4a2bef6

3 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎internal/test/any_of/param/param.gen.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/test/components/components.gen.go‎

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/codegen/templates/union.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
return err
5454
}
5555

56-
merged, err := runtime.JsonMerge(b, t.union)
56+
merged, err := runtime.JsonMerge(t.union, b)
5757
t.union = merged
5858
return err
5959
}

0 commit comments

Comments
 (0)