rebase fix
This commit is contained in:
parent
2998c6fe40
commit
0e3715b60d
@ -11,19 +11,4 @@
|
||||
./scripts/tasks.nix
|
||||
./scripts/update-dns.nix
|
||||
];
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
my.scripts = {
|
||||
download.enable = lib.mkDefault false;
|
||||
ffmpeg4discord.enable = lib.mkDefault false;
|
||||
ffmpreg.enable = lib.mkDefault false;
|
||||
find-dup-episodes.enable = lib.mkDefault false;
|
||||
manage-library.enable = lib.mkDefault false;
|
||||
pika-list.enable = lib.mkDefault false;
|
||||
run.enable = lib.mkDefault false;
|
||||
split-dir.enable = lib.mkDefault false;
|
||||
tasks.enable = lib.mkDefault false;
|
||||
update-dns.enable = lib.mkDefault false;
|
||||
};
|
||||
>>>>>>> f7500a4 (fixed servers/nginx quirks on 24.05)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user