Fixing up monitor_gating.yml after botched rebase.

2021-06-17 10:28:29 +02:00 · 2021-06-17 10:28:29 +02:00 · 2c0101d083
commit 2c0101d083
parent c3c836220f
1 changed files with 0 additions and 4 deletions
--- a/playbooks/openshift-apps/monitor_gating.yml
+++ b/playbooks/openshift-apps/monitor_gating.yml
@ -20,10 +20,6 @@
    - scoady
    - wwoods
    - zlopez
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes

  - role: rabbit/user
    username: "monitor-gating{{ env_suffix }}"