Skip to content

Commit

Permalink
fix: remove unexpected mergo options (labring#3682)
Browse files Browse the repository at this point in the history
  • Loading branch information
fengxsong committed Aug 15, 2023
1 parent 1c73745 commit 570ae90
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ func getMergeConfigData(path string, data []byte) ([]byte, error) {
return nil, fmt.Errorf("failed to unmarshal config: %v", err)
}
if err := mergo.Merge(&configMap, &mergeConfigMap,
mergo.WithOverwriteWithEmptyValue, mergo.WithOverrideEmptySlice,
mergo.WithAppendSlice, mergo.WithTypeCheck, mergo.WithSliceDeepCopy,
mergo.WithOverwriteWithEmptyValue, mergo.WithTypeCheck,
); err != nil {
return nil, fmt.Errorf("merge: %v", err)
}
Expand Down

0 comments on commit 570ae90

Please sign in to comment.