ArgoCD resolved

2025-11-24 13:43:00 +01:00
parent a14a80f7bd
commit c125427b8d
1 changed files with 0 additions and 4 deletions
--- a/argocd/ingress.yaml
+++ b/argocd/ingress.yaml
@@ -4,11 +4,7 @@ metadata:
  name: django
  namespace: vorgabenui
  annotations:
-<<<<<<< Updated upstream
    argocd.argoproj.io/ignore-healthcheck: "true"
-=======
-    nginx.ingress.kubernetes.io/rewrite-target: /
->>>>>>> Stashed changes
 spec:
  ingressClassName: traefik
  rules: