From 5c4a043232e65f7f67a67df3db07bab553503d1f Mon Sep 17 00:00:00 2001 From: alessandroargentieri Date: Wed, 25 Sep 2024 16:55:01 +0200 Subject: [PATCH] remove conflict markers --- cmd/kubernetes/kubernetes_nodepool_create.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmd/kubernetes/kubernetes_nodepool_create.go b/cmd/kubernetes/kubernetes_nodepool_create.go index d102677a..ec48e4b4 100644 --- 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,