v7 namespace

strangelove-ventures · Oct 11, 2023 · 397c7dd · 397c7dd
1 parent d2b9f31
commit 397c7dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/chain/cosmos/tokenfactory.go b/chain/cosmos/tokenfactory.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/strangelove-ventures/interchaintest/v8/ibc"
+	"github.com/strangelove-ventures/interchaintest/v7/ibc"
 )
 
 // TokenFactoryCreateDenom creates a new tokenfactory token in the format 'factory/accountaddress/name'.

diff --git a/examples/cosmos/chain_miscellaneous_test.go b/examples/cosmos/chain_miscellaneous_test.go
@@ -4,16 +4,10 @@ import (
 	"context"
 	"testing"
 
-<<<<<<< HEAD
+	"cosmossdk.io/math"
 	"github.com/strangelove-ventures/interchaintest/v7"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v7/ibc"
-=======
-	"cosmossdk.io/math"
-	"github.com/strangelove-ventures/interchaintest/v8"
-	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
-	"github.com/strangelove-ventures/interchaintest/v8/ibc"
->>>>>>> fcfcac6 (Adds x/tokenfactory helper methods (#798))
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )