chore: conflicts

celestiaorg · Nov 6, 2023 · d269745 · d269745
1 parent eae05d7
commit d269745
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/blobstream/deploy/config.go b/cmd/blobstream/deploy/config.go
@@ -58,7 +58,7 @@ type deployConfig struct {
 	evmAccAddress     string
 	startingNonce     string
 	evmGasLimit       uint64
-  grpcInsecure      bool
+	grpcInsecure      bool
 }
 
 func parseDeployFlags(cmd *cobra.Command) (deployConfig, error) {

diff --git a/rpc/app_querier.go b/rpc/app_querier.go
@@ -2,13 +2,13 @@ package rpc
 
 import (
 	"context"
+	"crypto/tls"
 	"strconv"
 	"time"
 
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	cosmosgrpc "github.com/cosmos/cosmos-sdk/types/grpc"
 	"google.golang.org/grpc/metadata"
-	"crypto/tls"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"