chore: resolve conflicts

noble-assets · Mar 18, 2024 · 03ec41e · 03ec41e
1 parent d0f11e2
commit 03ec41e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/x/forwarding/keeper/keeper.go b/x/forwarding/keeper/keeper.go
@@ -8,12 +8,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
 	clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
-<<<<<<< HEAD
-	"github.com/noble-assets/noble/v4/x/forwarding/types"
-=======
 	channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
-	"github.com/noble-assets/noble/v5/x/forwarding/types"
->>>>>>> 33dc4aa (fix: check channel state (#328))
+	"github.com/noble-assets/noble/v4/x/forwarding/types"
 	"github.com/tendermint/tendermint/libs/log"
 )
 

diff --git a/x/forwarding/keeper/msg_server.go b/x/forwarding/keeper/msg_server.go
@@ -8,12 +8,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
-<<<<<<< HEAD
-	"github.com/noble-assets/noble/v4/x/forwarding/types"
-=======
 	channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
-	"github.com/noble-assets/noble/v5/x/forwarding/types"
->>>>>>> 33dc4aa (fix: check channel state (#328))
+	"github.com/noble-assets/noble/v4/x/forwarding/types"
 )
 
 var _ types.MsgServer = &Keeper{}