nix

commit a9749946dc6f07d0763b492778135cde25e35166
parent 1d75b88f4ecb5f5ba1ae680f19cb6fddc10e0a18
Author: mtmn <miro@haravara.org>
Date:   Tue, 14 Apr 2026 10:38:22 +0200

fix conflict

Diffstat:
M
secrets.nix
 | 
6
------

1 file changed, 0 insertions(+), 6 deletions(-)
diff --git a/secrets.nix b/secrets.nix
@@ -15,12 +15,6 @@ in {
   "secrets/miniflux-secrets.age".publicKeys = allKeys;
   "secrets/listenbrainz-token.age".publicKeys = allKeys;
   "secrets/mpd-host.age".publicKeys = allKeys;
-  "secrets/scorpus.age".publicKeys = allKeys;
-<<<<<<< HEAD
-  "secrets/corpus.age".publicKeys = allKeys;
-||||||| dfd7511
-=======
   "secrets/corpus.age".publicKeys = allKeys;
   "secrets/corpus-pstmn.age".publicKeys = allKeys;
->>>>>>> 944c589117f33b05e5b2c43c0bbad43f6977f0fc
 }