From e0add01e3cca8aa972f066a13f24af06bbad7bf0 Mon Sep 17 00:00:00 2001
From: Marco Milano <64802282+marmila@users.noreply.github.com>
Date: Tue, 9 Apr 2024 15:56:14 +0200
Subject: [PATCH] Update kustomization.yaml

---
 argocd/bootstrap/crds/external-secrets/kustomization.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/argocd/bootstrap/crds/external-secrets/kustomization.yaml b/argocd/bootstrap/crds/external-secrets/kustomization.yaml
index a347c57c..10095eea 100644
--- a/argocd/bootstrap/crds/external-secrets/kustomization.yaml
+++ b/argocd/bootstrap/crds/external-secrets/kustomization.yaml
@@ -4,8 +4,5 @@ resources:
 # external-secrets https://github.com/external-secrets/external-secrets/tree/main/deploy/charts/external-secrets
 # helm chart version 0.9.13
 # external-secrets helm chart to be installed with value installCDRs=false
-<<<<<<< HEAD
-- https://raw.githubusercontent.com/external-secrets/external-secrets/v0.9.12/deploy/crds/bundle.yaml
-=======
 - https://raw.githubusercontent.com/external-secrets/external-secrets/v0.9.13/deploy/crds/bundle.yaml
->>>>>>> upstream/master
+