Resolve conflict

2023-08-10 10:30:04 +02:00
parent 9665fbc8a4
commit b563303559
2 changed files with 1 additions and 5 deletions
--- a/charts/user-monitoring/templates/user-prometheus.yaml
+++ b/charts/user-monitoring/templates/user-prometheus.yaml
@@ -20,10 +20,6 @@ spec:
  resources:
    requests:
      memory: 400Mi
-<<<<<<< HEAD
-  enableAdminAPI: false
-=======
  enableAdminAPI: true
  externalLabels:
    monitoring: {{ .Values.user }}
->>>>>>> 2acef0e (Update prometheus config)