Skip to content

Commit be99087

Browse files
author
Jamie Tanna
committed
Flip functions' order to minimise diff
1 parent b036170 commit be99087

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

jsonmerge.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ import (
66
"github.com/apapsch/go-jsonmerge/v2"
77
)
88

9+
// JsonMerge merges two JSON representation into a single object. `data` is the
10+
// existing representation and `patch` is the new data to be merged in
11+
//
12+
// Deprecated: Use JSONMerge instead.
13+
func JsonMerge(data, patch json.RawMessage) (json.RawMessage, error) {
14+
return JSONMerge(data, patch)
15+
}
16+
917
// JSONMerge merges two JSON representation into a single object. `data` is the
1018
// existing representation and `patch` is the new data to be merged in
1119
func JSONMerge(data, patch json.RawMessage) (json.RawMessage, error) {
@@ -24,11 +32,3 @@ func JSONMerge(data, patch json.RawMessage) (json.RawMessage, error) {
2432
}
2533
return merged, nil
2634
}
27-
28-
// JsonMerge merges two JSON representation into a single object. `data` is the
29-
// existing representation and `patch` is the new data to be merged in
30-
//
31-
// Deprecated: Use JSONMerge instead.
32-
func JsonMerge(data, patch json.RawMessage) (json.RawMessage, error) {
33-
return JSONMerge(data, patch)
34-
}

0 commit comments

Comments
 (0)