diff --git a/containers/kubernetes/how-to/edit-kosmos-cluster.mdx b/containers/kubernetes/how-to/edit-kosmos-cluster.mdx index acfee21145..bd40254dc9 100644 --- a/containers/kubernetes/how-to/edit-kosmos-cluster.mdx +++ b/containers/kubernetes/how-to/edit-kosmos-cluster.mdx @@ -112,10 +112,3 @@ The Kubernetes version of the existing nodes in your multi-cloud pool can be upg 4. Detach the older node in Scaleway API. -<<<<<<< HEAD -======= - - How to create a Kosmos cluster - How to manage Kubeconfig files with IAM - ->>>>>>> 17c4e486d (feat(k8s): iam and rbac)