diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix
index 7696270..a59d36c 100644
--- a/nixos/roles/default.nix
+++ b/nixos/roles/default.nix
@@ -52,5 +52,4 @@ services = {
     };
   };
 };
->>>>>>> 2b0eec7 (added actual hardware identifiers & atual network config)
 }