From 2c0101d083d3c2045fb20882a42cce057759f6a6 Mon Sep 17 00:00:00 2001
From: Adam Saleh <asaleh@redhat.com>
Date: Thu, 17 Jun 2021 10:28:29 +0200
Subject: [PATCH] Fixing up monitor_gating.yml after botched rebase.

---
 playbooks/openshift-apps/monitor_gating.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/playbooks/openshift-apps/monitor_gating.yml b/playbooks/openshift-apps/monitor_gating.yml
index 00665adeba..ac4e8885a4 100644
--- 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 }}"