Fix merge conflict

Signed-off-by: EdricCua <[email protected]>
valkey-io · Jan 29, 2025 · 3eea241 · 3eea241
1 parent 5fbc2bb
commit 3eea241
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/go/api/glide_cluster_client.go b/go/api/glide_cluster_client.go
@@ -18,6 +18,7 @@ type GlideClusterClientCommands interface {
 	BaseClient
 	GenericClusterCommands
 	ServerManagementClusterCommands
+	ConnectionManagementClusterCommands
 }
 
 // GlideClusterClient implements cluster mode operations by extending baseClient functionality.

diff --git a/go/integTest/cluster_commands_test.go b/go/integTest/cluster_commands_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/valkey-io/valkey-glide/go/glide/api"
 	"github.com/valkey-io/valkey-glide/go/glide/api/config"
+	"github.com/valkey-io/valkey-glide/go/glide/api/options"
 )
 
 func (suite *GlideTestSuite) TestClusterCustomCommandInfo() {