Merge pull request #122275 from dt/skew

release-24.1: cli: fix merge skew
cockroachdb · Apr 12, 2024 · 0f6788a · 0f6788a
2 parents 8947e1e + 788848b
commit 0f6788a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pkg/cli/context.go b/pkg/cli/context.go
@@ -24,6 +24,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/cli/clisqlexec"
 	"github.com/cockroachdb/cockroach/pkg/cli/clisqlshell"
 	"github.com/cockroachdb/cockroach/pkg/cli/democluster"
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/security/clientsecopts"
 	"github.com/cockroachdb/cockroach/pkg/security/username"