summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-07-27 20:43:34 +0200
committertv <tv@krebsco.de>2017-07-27 20:43:34 +0200
commit904b78d7352ddddcc514f325f8bc1e447a4c05ff (patch)
tree9436bfd0d04bdf84386d5d7399fe6adf13fb9a04 /makefu
parent252d45d212ad0b67336636914a721eb08b5df1c3 (diff)
parent9e0a791281c216b150e4c35a5d4011353237ddfd (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/shoney/config.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/makefu/1systems/shoney/config.nix b/makefu/1systems/shoney/config.nix
index 6cec260d2..ba9d0911e 100644
--- a/makefu/1systems/shoney/config.nix
+++ b/makefu/1systems/shoney/config.nix
@@ -14,7 +14,6 @@ in {
<stockholm/makefu/2configs/hw/CAC.nix>
<stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
<stockholm/makefu/2configs/tinc/retiolum.nix>
- <stockholm/makefu/2configs/torrent.nix>
];