From 55a69e2dd06523cf7f466fd21e4e14c04ac3a3e8 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Tue, 27 Jan 2026 20:49:41 +0200
Subject: fix

---
 f3s/AGENTS.md | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'f3s/AGENTS.md')

diff --git a/f3s/AGENTS.md b/f3s/AGENTS.md
index 2466100..e6c51bb 100644
--- a/f3s/AGENTS.md
+++ b/f3s/AGENTS.md
@@ -1,11 +1,7 @@
 Follow file:///home/paul/Notes/snippets/f3s/f3s.md
-<<<<<<< HEAD
-||||||| 7b4d629
-=======
 
 ## Security Policy
 
 - **Never commit secrets to git.** This includes SSH private keys, API tokens, passwords, and any other sensitive credentials.
 - Secrets must be deployed as Kubernetes Secrets directly via `kubectl create secret` or through a secrets management solution.
 - If a secret is accidentally committed, it must be rotated immediately and pruned from git history using `git-filter-repo`.
->>>>>>> 529caf525d3c8594bcf0208697629827113dc1fc
-- 
cgit v1.2.3