Skip to content

Commit

Permalink
Merge pull request #42 from rkrishnan2012/main
Browse files Browse the repository at this point in the history
Fix merging between plugin config and manifest values.
  • Loading branch information
rholshausen authored Jan 23, 2024
2 parents 884b36c + 6f9844c commit 3c51f8d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ impl ProtobufPactPlugin {
let val = proto_value_to_json(v);
match plugin_config.entry(k.clone()) {
Entry::Occupied(mut e) => {
e.insert(merge_value(&val, e.get())?);
e.insert(merge_value(e.get(), &val)?);
},
Entry::Vacant(e) => {
e.insert(val);
Expand Down

0 comments on commit 3c51f8d

Please sign in to comment.