From 4c4cfb56cd3dc9b77e0320c25adbf5ac5aa09b38 Mon Sep 17 00:00:00 2001
From: dtoro <d.toro.v@pm.me>
Date: Wed, 3 Jun 2026 22:03:36 +0200
Subject: [PATCH] fix: remove stray merge marker in .sops.yaml; rekey
 netbird-pat to 4 recipients

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .sops.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.sops.yaml b/.sops.yaml
index 13ffccb..2a779b3 100644
--- 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