fix: partially fix a totally botched merge.

2025-09-12 14:32:42 +02:00
parent c8814ec8d9
commit fcd136ed4e
21 changed files with 2 additions and 73 deletions
--- a/rossby/login/default.nix
+++ b/rossby/login/default.nix
@@ -113,17 +113,10 @@ in
    networking = {
      useDHCP = false;
      hostName = name;
-<<<<<<<< HEAD:rossby/login/default.nix
      interfaces.enp129s0f0 = {
        useDHCP = false;
        ipv4.addresses = [ {
          inherit address;
-========
-      interfaces.enp33s0f3np3 = {
-        useDHCP = false;
-        ipv4.addresses = [ {
-          address = address;
->>>>>>>> ekman:ekman/login/default.nix
          prefixLength = 24;
        } ];
        # ipv4.routes = [