Merge branch 'nyarlathtop' of ssh://gitea.mathebau.de:3022/dennis/nixConfig into nyarlathtop

2023-09-25 21:57:04 +02:00 · 2023-09-25 21:57:04 +02:00 · 12a20c4c52
commit 12a20c4c52
parent 8d3731eeb3 d89313e25d
2 changed files with 3 additions and 1 deletions
--- a/nixos/roles/default.nix
+++ b/nixos/roles/default.nix
@ -51,5 +51,4 @@ services = {
    };
  };
 };
->>>>>>> 2b0eec7 (added actual hardware identifiers & atual network config)
 }