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 | c562e447ba927ea20bf7d2dfff9a4f4807ee4463 (patch) | |
| tree | 57f5496e7acbc9dfeec7f406a6857687219625d0 /tv/1systems | |
| parent | b96fd072e1ac5e5b6b5b3e92c678dc4bb4cb7e1f (diff) | |
| parent | 9b890750e24f43182ebf1732871a60d9e0c74c89 (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 7cb903a44..8c2a9ae43 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 e1a9076dc..1f3e010a4 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 |