remove conflict markers

civo · Sep 25, 2024 · 5c4a043 · 5c4a043
1 parent f1a6cf5
commit 5c4a043
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/cmd/kubernetes/kubernetes_nodepool_create.go b/cmd/kubernetes/kubernetes_nodepool_create.go
@@ -58,8 +58,6 @@ var kubernetesNodePoolCreateCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-<<<<<<< HEAD
-=======
 		poolConfig := civogo.KubernetesClusterPoolUpdateConfig{ID: poolID, Count: &numTargetNodesPool, Size: targetNodesPoolSize}
 		if publicIpNodePool {
 			if config.Current.RegionToFeatures != nil {
@@ -71,7 +69,6 @@ var kubernetesNodePoolCreateCmd = &cobra.Command{
 			poolConfig.PublicIPNodePool = publicIpNodePool
 		}
 
->>>>>>> 7380023 (fix plural on volume_attachments)
 		kubernetesCluster, err := client.CreateKubernetesClusterPool(kubernetesFindCluster.ID, &civogo.KubernetesClusterPoolConfig{
 			Region:           client.Region,
 			ID:               poolID,