summaryrefslogtreecommitdiffstats
path: root/3modules
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-07-24 10:57:53 +0200
committermakefu <github@syntax-fehler.de>2015-07-24 10:57:53 +0200
commit92ad08a34ee358dbdf96bcee5ee5ffc137712842 (patch)
tree42d2311ad60dfe545052b6a8bc0d7e0df14adc25 /3modules
parent2b3030c7b27f98b8f00d91c63bd60c980e64071b (diff)
parentea498c46bc98771ab0e66eec21612cbf78b3ef01 (diff)
Merge remote-tracking branch 'cd/master'
Conflicts: 3modules/tv/retiolum.nix
Diffstat (limited to '3modules')
-rw-r--r--3modules/tv/retiolum.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/3modules/tv/retiolum.nix b/3modules/tv/retiolum.nix
index 7a5ab70db..e8a1f6c2b 100644
--- a/3modules/tv/retiolum.nix
+++ b/3modules/tv/retiolum.nix
@@ -83,11 +83,10 @@ let
type = types.listOf types.str;
default = [ "fastpoke" "pigstarter" "kheurop" ];
description = ''
- The list of hosts in the network which the client will try to connect to.
- These hosts should have an 'Address' configured which points to a routeable
- IPv4 or IPv6 address
- ''
- ;
+ The list of hosts in the network which the client will try to connect
+ to. These hosts should have an 'Address' configured which points to a
+ routeable IPv4 or IPv6 address.
+ '';
};
};