Skip to content

Commit

Permalink
Merge pull request #98 from comdex-official/merge_fix
Browse files Browse the repository at this point in the history
Merge fix
  • Loading branch information
dheerajkd30 authored Mar 9, 2022
2 parents 2ed4648 + 15fc5b9 commit 9dde59f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ func New(
evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
vaulttypes.StoreKey, liquiditytypes.StoreKey, assettypes.StoreKey,
oracletypes.StoreKey, bandoraclemoduletypes.StoreKey, liquidationtypes.StoreKey,
auctiontypes.StoreKey, assettypes.StoreKey, wasm.StoreKey,
auctiontypes.StoreKey, wasm.StoreKey,
)
)

Expand Down Expand Up @@ -616,7 +616,7 @@ func New(
distrtypes.ModuleName, genutiltypes.ModuleName, vesting.AppModuleBasic{}.Name(), evidencetypes.ModuleName, ibchost.ModuleName,
vaulttypes.ModuleName, wasmtypes.ModuleName, authtypes.ModuleName, slashingtypes.ModuleName, paramstypes.ModuleName,
oracletypes.ModuleName, capabilitytypes.ModuleName, upgradetypes.ModuleName, transferModule.Name(),
assettypes.ModuleName, banktypes.ModuleName,
assettypes.ModuleName, banktypes.ModuleName, liquidationtypes.ModuleName, auctiontypes.ModuleName,
)

// NOTE: The genutils module must occur after staking so that pools are
Expand Down

0 comments on commit 9dde59f

Please sign in to comment.