keep

Signed-off-by: geoffrey1330 <[email protected]>
keptn · Sep 22, 2023 · 26989d3 · 26989d3
1 parent df50087
commit 26989d3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml
@@ -3,11 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-<<<<<<< HEAD
     controller-gen.kubebuilder.io/version: v0.13.0
-=======
-    controller-gen.kubebuilder.io/version: v0.12.0
->>>>>>> 9f2c6d64 (keep)
   name: keptnmetricsproviders.metrics.keptn.sh
 spec:
   group: metrics.keptn.sh