chore: 318 merge conflicts (#397)

dymensionxyz · Apr 25, 2024 · aca2c8d · aca2c8d
1 parent 71baccb
commit aca2c8d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/testutil/app/app.go b/testutil/app/app.go
@@ -34,6 +34,7 @@ import (
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	"github.com/cosmos/cosmos-sdk/x/auth/posthandler"
 	authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation"
+	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting"