updates

Author: fghanmi

bundle/manifests/rhtas-operator.clusterserviceversion.yaml

@@ -192,11 +192,7 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     containerImage: registry.redhat.io/rhtas/rhtas-rhel9-operator@sha256:a21f7128694a64989bf0d84a7a7da4c1ffc89edf62d594dc8bea7bcfe9ac08d3
-<<<<<<< HEAD
-    createdAt: "2024-07-30T13:51:04Z"
-=======
     createdAt: "2024-08-03T09:05:31Z"
->>>>>>> df48e12 (updates-1)
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"
     features.operators.openshift.io/csi: "false"