Skip to content

Commit

Permalink
chore(runtime/v2): cleanup replaces (#21147)
Browse files Browse the repository at this point in the history
(cherry picked from commit c55e8d7)

# Conflicts:
#	runtime/v2/go.mod
  • Loading branch information
julienrbrt authored and mergify[bot] committed Aug 1, 2024
1 parent 7c24d56 commit f65b6ce
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion runtime/v2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@ replace (
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
<<<<<<< HEAD
cosmossdk.io/x/accounts => ../../x/accounts
cosmossdk.io/x/auth => ../../x/auth
cosmossdk.io/x/bank => ../../x/bank
cosmossdk.io/x/consensus => ../../x/consensus
cosmossdk.io/x/distribution => ../../x/distribution
cosmossdk.io/x/staking => ../../x/staking
=======
cosmossdk.io/server/v2/appmanager => ../../server/v2/appmanager
cosmossdk.io/server/v2/stf => ../../server/v2/stf
cosmossdk.io/store/v2 => ../../store/v2
>>>>>>> c55e8d710 (chore(runtime/v2): cleanup replaces (#21147))
cosmossdk.io/x/tx => ../../x/tx
github.com/cosmos/cosmos-sdk => ../..
)

require (
Expand Down

0 comments on commit f65b6ce

Please sign in to comment.