removed leftover merge marker

2023-09-30 17:31:19 +02:00 · 2023-09-30 17:31:19 +02:00 · 4ccc9c83e6
parent d0d7237fa6
commit 4ccc9c83e6
1 changed files with 0 additions and 1 deletions
--- a/nixos/roles/default.nix
+++ b/nixos/roles/default.nix
@ -52,5 +52,4 @@ services = {
    };
  };
 };
->>>>>>> 2b0eec7 (added actual hardware identifiers & atual network config)
 }