merge main

Signed-off-by: Markus Lippert <[email protected]>
prometheus-community · Aug 15, 2023 · aad8f66 · aad8f66
1 parent 4892a83
commit aad8f66
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -21,11 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-<<<<<<< HEAD
 version: 48.4.0
-=======
-version: 48.3.1
->>>>>>> upstream/main
 appVersion: v0.66.0
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus