fixed volcengine

gardener · Jul 8, 2024 · 5a29eea · 5a29eea
1 parent b204d50
commit 5a29eea
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/...scaler/cloudprovider/volcengine/volcengine-go-sdk/volcengine/universal/universal_const.go b/...scaler/cloudprovider/volcengine/volcengine-go-sdk/volcengine/universal/universal_const.go
@@ -19,13 +19,6 @@ package universal
 type HttpMethod int
 
 const (
-<<<<<<<< HEAD:cluster-autoscaler/vendor/github.com/vmware/govmomi/internal/version/version.go
-	// ClientName is the name of this SDK
-	ClientName = "govmomi"
-
-	// ClientVersion is the version of this SDK
-	ClientVersion = "0.30.6"
-========
 	GET HttpMethod = iota
 	HEAD
 	POST
@@ -39,5 +32,4 @@ const (
 	Default ContentType = iota
 	FormUrlencoded
 	ApplicationJSON
->>>>>>>> upstream-release-1.30.0:cluster-autoscaler/cloudprovider/volcengine/volcengine-go-sdk/volcengine/universal/universal_const.go
 )