fix: remove stray merge marker in .sops.yaml; rekey netbird-pat to 4 recipients

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-03 22:03:36 +02:00
parent cb1d8b39b9
commit 4c4cfb56cd
1 changed files with 0 additions and 1 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -87,5 +87,4 @@ creation_rules:
      age1xkklkvnk5z0fsnh6cfgv70hy9ksfy8rdprwerzw4yk3p4p7cxcqs2yvpz6,
      age1vf8h7s8mqsn2q5eadgpdupsj4mwn8zguc77d85ws3xj40sl9rgksx2rxw6,
      age1z62ff2ak9zj5ctcvaxwyyhedwjvlwgm2dkn9nk3wrwk8fkavcpmsqwc2vs
->>>>>>> ce1bf4d0d229b6e76c04e848cb0bb01d76dd5d37
 # webhook noop 2026-05-20T18:16:57+02:00