fixed conflict in crds

marmila · Apr 9, 2024 · cf2c54a · cf2c54a
1 parent e6c9412
commit cf2c54a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/argocd/bootstrap/crds/external-secrets/kustomization.yaml b/argocd/bootstrap/crds/external-secrets/kustomization.yaml
@@ -5,4 +5,3 @@ resources:
 # helm chart version 0.9.13
 # external-secrets helm chart to be installed with value installCDRs=false
 - https://raw.githubusercontent.com/external-secrets/external-secrets/v0.9.13/deploy/crds/bundle.yaml
-
diff --git a/argocd/bootstrap/crds/kube-prometheus-stack/kustomization.yaml b/argocd/bootstrap/crds/kube-prometheus-stack/kustomization.yaml
@@ -6,8 +6,4 @@ resources:
 helmCharts:
 - name: prometheus-operator-crds
   repo: https://prometheus-community.github.io/helm-charts
-<<<<<<< HEAD
   version: "10.0.0"
-=======
-  version: "10.0.0"
->>>>>>> upstream/master
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@ resources:
		# helm chart version 0.9.13
		# external-secrets helm chart to be installed with value installCDRs=false
		- https://raw.githubusercontent.com/external-secrets/external-secrets/v0.9.13/deploy/crds/bundle.yaml