Skip to content

Commit

Permalink
conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@swelf19
swelf19 committed Jun 25, 2024
2 parents 106caa9 + 80632ba commit cec7a87
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1094,8 +1094,8 @@ func New(
crontypes.ModuleName,
globalfee.ModuleName,
feemarkettypes.ModuleName,
marketmaptypes.ModuleName,
oracletypes.ModuleName,
marketmaptypes.ModuleName,
ibcswaptypes.ModuleName,
dextypes.ModuleName,
dynamicfeestypes.ModuleName,
Expand Down

0 comments on commit cec7a87

Please sign in to comment.