Skip to content

Commit

Permalink
chore: fix rebase error
Browse files Browse the repository at this point in the history
  • Loading branch information
dadamu committed May 17, 2023
1 parent cdcdb79 commit 28719f5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion x/subspaces/ante/expected_keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ante
import (
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/desmos-labs/desmos/v4/x/subspaces/types"
"github.com/desmos-labs/desmos/v5/x/subspaces/types"
)

// DONTCOVER
Expand Down
2 changes: 1 addition & 1 deletion x/subspaces/ante/testutil/expected_keepers_mocks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions x/subspaces/ante/tx_checker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
subspacesante "github.com/desmos-labs/desmos/v4/x/subspaces/ante"
"github.com/desmos-labs/desmos/v4/x/subspaces/types"
subspacesante "github.com/desmos-labs/desmos/v5/x/subspaces/ante"
"github.com/desmos-labs/desmos/v5/x/subspaces/types"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions x/subspaces/simulation/proposal.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/simulation"

"github.com/desmos-labs/desmos/v4/x/subspaces/keeper"
"github.com/desmos-labs/desmos/v4/x/subspaces/types"
"github.com/desmos-labs/desmos/v5/x/subspaces/keeper"
"github.com/desmos-labs/desmos/v5/x/subspaces/types"
)

// DONTCOVER
Expand Down

0 comments on commit 28719f5

Please sign in to comment.