diff options
| author | miefda <miefda@miefda.de> | 2015-12-30 18:24:44 +0100 |
|---|---|---|
| committer | miefda <miefda@miefda.de> | 2015-12-30 18:24:44 +0100 |
| commit | 95f740239767361bd4191a7d18d97dec93253151 (patch) | |
| tree | 066b54e1b025ba904fe5451196538ca92bc4b8df /tv/1systems | |
| parent | e08a5484a7ee09ce3c353aa0cd1fabb65e073c42 (diff) | |
| parent | c8dd7f377075545dd1431a9f1b699260abe27c57 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/cd.nix | 1 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 7cb903a..8c2a9ae 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -7,7 +7,6 @@ with lib; krebs.build.target = "root@cd.internet"; imports = [ - ../2configs/backup.nix ../2configs/hw/CAC-Developer-2.nix ../2configs/fs/CAC-CentOS-7-64bit.nix #../2configs/consul-server.nix diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index e1a9076..1f3e010 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -9,7 +9,6 @@ with lib; "7ae05edcdd14f6ace83ead9bf0d114e97c89a83a"; imports = [ - ../2configs/backup.nix # TODO ../2configs/hw/x220.nix #../2configs/consul-client.nix ../2configs/git.nix |