summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-23 23:53:10 +0200
committerlassulus <lassulus@lassul.us>2017-07-23 23:53:10 +0200
commit5b980c6a3271d8dac507c2c7d34f99ee0ccf9432 (patch)
tree961800253eb65c0b3742d629f8a2e57d5e1ced97 /makefu/1systems
parent6fc6456ed930bf53a191bc7d09552b31bb10556d (diff)
parentf5459736cfbf2f3f23d525887184eadd743e6e91 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-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>
];