fix: fix ekman part of botched merge

2025-09-12 14:38:36 +02:00
parent fcd136ed4e
commit eb7b1f8130
23 changed files with 261 additions and 368 deletions
--- a/ekman/manage/default.nix
+++ b/ekman/manage/default.nix
@@ -1,8 +1,3 @@
-<<<<<<< HEAD:configuration.nix
-_:
-{
-  imports = [ ./rossby/manage ];
-=======
 { pkgs, ...}:
 let
  computeNodes =
@@ -350,5 +345,5 @@ in {
      ../mounts.nix
      ../myvnc.nix
  ];
->>>>>>> ekman:ekman/manage/default.nix
 }
+