Skip to content
Snippets Groups Projects
Commit cbab3b85 authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

fix forgotten merge conflict

parent 862f047b
No related branches found
No related tags found
No related merge requests found
......@@ -76,10 +76,5 @@
>> {{ log_directory }}/helmfile.log
args:
executable: /bin/bash
<<<<<<< HEAD
with_items: "{{ helmfiles }}"
when: item is not search("cert-manager") and item is not search("monitoring")
=======
loop: "{{ helmfiles }}"
when: item is not search("cert-manager")
>>>>>>> 351-prometheus-installation-can-not-be-repeated
when: item is not search("cert-manager") and item is not search("monitoring")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment