Fix merge conflict

CosmWasm · Mar 6, 2023 · 7969723 · 7969723
1 parent 0b8af25
commit 7969723
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/x/wasm/client/cli/gov_tx.go b/x/wasm/client/cli/gov_tx.go
@@ -9,13 +9,6 @@ import (
 	"strconv"
 	"strings"
 
-<<<<<<< HEAD
-=======
-	"github.com/CosmWasm/wasmd/x/wasm/ioutils"
-
-	"github.com/docker/distribution/reference"
-
->>>>>>> 1a8019b (Fix client checksum verification (#1234))
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -27,6 +20,7 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
+	"github.com/CosmWasm/wasmd/x/wasm/ioutils"
 	"github.com/CosmWasm/wasmd/x/wasm/types"
 )