Fix yamllint issue with comments

kubernetes-sigs · Jul 26, 2024 · 5658cfd · 5658cfd
1 parent 89d037b
commit 5658cfd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
@@ -51,11 +51,7 @@
     - kube_network_plugin != "calico" or calico_datastore == "etcd"
     - inventory_hostname in groups['k8s_cluster']
   tags:
-<<<<<<< HEAD
     - master    # Will eventually be deprecated, replaced by "control-plane"
-=======
-    - master # Will eventually be deprecated, replaced by "control-plane"
->>>>>>> 44994086c (Fix handlers and tags)
     - control-plane
     - network
 

diff --git a/roles/kubernetes/preinstall/tasks/0050-create_directories.yml b/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
@@ -40,11 +40,7 @@
     - bootstrap-os
     - apps
     - network
-<<<<<<< HEAD
     - master    # Will eventually be deprecated, replaced by "control-plane"
-=======
-    - master # Will eventually be deprecated, replaced by "control-plane"
->>>>>>> 44994086c (Fix handlers and tags)
     - control-plane
     - node
   with_items: