git weirndness

2026-01-03 08:45:32 +11:00
parent 64f3347058
commit 8457a529f7
1 changed files with 1 additions and 4 deletions
--- a/manifests/stateful-backups.yaml
+++ b/manifests/stateful-backups.yaml
@@ -60,7 +60,6 @@ spec:
                timeout: 5m
                onError: Continue

-<<<<<<< HEAD
        # Gitea PostgreSQL: checkpoint before backup
        #- name: gitea-postgres-checkpoint
        #  includedNamespaces:
@@ -79,9 +78,7 @@ spec:
        #        timeout: 2m
        #        onError: Continue
        # Authentik PostgreSQL: checkpoint before backup
-=======
-          # Authentik PostgreSQL: checkpoint before backup
->>>>>>> 082f471 (Allow snapshits for NFS (hopefully))
+        # Authentik PostgreSQL: checkpoint before backup
        - name: authentik-postgres-checkpoint
          includedNamespaces:
            - authentik