diff options
author | makefu <github@syntax-fehler.de> | 2016-06-23 17:04:07 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-06-23 17:04:07 +0200 |
commit | 271a59b1d6222f7336fac427631ee5bb569a000e (patch) | |
tree | 804b845cebb530001e79b16ddcb70d2d12d8c7f5 /lass/1systems/mors.nix | |
parent | d5e0dcccd074d7e63cfa7fff35782cb92c101270 (diff) | |
parent | a8dcedbb99151ce396d58573f339fa34d7537fa1 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/mors.nix')
-rw-r--r-- | lass/1systems/mors.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index beb5659d0..062e4c29d 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -26,11 +26,10 @@ ../2configs/teamviewer.nix ../2configs/libvirt.nix ../2configs/fetchWallpaper.nix - ../2configs/cbase.nix + ../2configs/c-base.nix ../2configs/mail.nix ../2configs/krebs-pass.nix ../2configs/umts.nix - #../2configs/buildbot-standalone.nix { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ |