fix build

whoffler · whoffler · commit b5123757f26d · 2025-10-20T12:45:50.000+01:00
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,11 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
+<<<<<<< HEAD
   "generated_at": "2025-10-11T13:30:14Z",
+=======
+  "generated_at": "2025-10-13T10:09:56Z",
+>>>>>>> 484c832 (fix build)
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
