From 8457a529f749f9c4efd812946e724ed7340efc80 Mon Sep 17 00:00:00 2001
From: Conan Scott <conanscott@gmail.com>
Date: Sat, 3 Jan 2026 08:45:32 +1100
Subject: [PATCH] git weirndness

---
 manifests/stateful-backups.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/stateful-backups.yaml b/manifests/stateful-backups.yaml
index 15afff1..f6a2299 100644
--- 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