fix pending merge conflict

jaideepr97 · jaideepr97 · commit ea5e579b6196 · 2023-09-08T12:27:29.000-04:00
Signed-off-by: Jaideep Rao &lt;jaideep.r97@gmail.com&gt;
diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
@@ -19,8 +19,4 @@ spec:
         serverName: openshift-gitops-operator-metrics-service.openshift-gitops-operator.svc
   selector:
     matchLabels:
-<<<<<<< HEAD
       control-plane: gitops-operator
-=======
-      control-plane: gitops-operator
->>>>>>> 5a223ae1212252b78662554f9836f4b72417f5a4
