chore: fix imports

cosmos · Oct 7, 2024 · 1d41f74 · 1d41f74
1 parent 8028983
commit 1d41f74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/modules/core/03-connection/types/genesis.go b/modules/core/03-connection/types/genesis.go
@@ -3,12 +3,8 @@ package types
 import (
 	"fmt"
 
-<<<<<<< HEAD
 	host "github.com/cosmos/ibc-go/v8/modules/core/24-host"
-=======
-	host "github.com/cosmos/ibc-go/v9/modules/core/24-host"
-	"github.com/cosmos/ibc-go/v9/modules/core/exported"
->>>>>>> ff2b668c (fix: avoid invalid identifier error when validate genesis (#7397))
+	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 )
 
 // NewConnectionPaths creates a ConnectionPaths instance.

diff --git a/modules/core/03-connection/types/genesis_test.go b/modules/core/03-connection/types/genesis_test.go
@@ -5,16 +5,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-<<<<<<< HEAD
 	"github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
 	commitmenttypes "github.com/cosmos/ibc-go/v8/modules/core/23-commitment/types"
+	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 	ibctesting "github.com/cosmos/ibc-go/v8/testing"
-=======
-	"github.com/cosmos/ibc-go/v9/modules/core/03-connection/types"
-	commitmenttypes "github.com/cosmos/ibc-go/v9/modules/core/23-commitment/types"
-	"github.com/cosmos/ibc-go/v9/modules/core/exported"
-	ibctesting "github.com/cosmos/ibc-go/v9/testing"
->>>>>>> ff2b668c (fix: avoid invalid identifier error when validate genesis (#7397))
 )
 
 func TestValidateGenesis(t *testing.T) {