fixed merging conflict

kiegroup · Apr 21, 2023 · e4fb462 · e4fb462
1 parent 8a38706
commit e4fb462
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/...olm-catalog/dev/7.13.2-1/manifests/businessautomation-operator.clusterserviceversion.yaml b/...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