From e4fb462f595df785419ab1fcdc6295607cff96be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Novotn=C3=BD?= Date: Fri, 21 Apr 2023 15:30:02 +0200 Subject: [PATCH] fixed merging conflict --- .../businessautomation-operator.clusterserviceversion.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/deploy/olm-catalog/dev/7.13.2-1/manifests/businessautomation-operator.clusterserviceversion.yaml b/deploy/olm-catalog/dev/7.13.2-1/manifests/businessautomation-operator.clusterserviceversion.yaml index 371416abb..43ff92a96 100644 --- a/deploy/olm-catalog/dev/7.13.2-1/manifests/businessautomation-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/dev/7.13.2-1/manifests/businessautomation-operator.clusterserviceversion.yaml @@ -409,11 +409,7 @@ spec: - operator labels: alm-owner-businessautomation: businessautomation-operator -<<<<<<< HEAD - operated-by: businessautomation-operator.7.13.2-1-dev-vknt4cq2dw -======= operated-by: businessautomation-operator.7.13.2-1-dev-ct4ptlc7zl ->>>>>>> main links: - name: Product Page url: https://access.redhat.com/products/red-hat-process-automation-manager