Merge remote-tracking branch 'origin/master'
1 file changed, 0 insertions(+), 1 deletion(-)
changed files
M marvin.nix → marvin.nix
@@ -22,7 +22,6 @@ ./modules/machines/x250.nix ./modules/programs/accounting.nix ./modules/programs/dotfiles.nix ./modules/programs/i3.nix - ./modules/programs/kde.nix ./modules/programs/infrastructure.nix ./modules/programs/passwords.nix ./modules/programs/shell.nix