From 4ccc9c83e63af79ab778386f84f35c6843917c8c Mon Sep 17 00:00:00 2001
From: Dennis Frieberg <dennis@frieberg.de>
Date: Sat, 30 Sep 2023 17:31:19 +0200
Subject: [PATCH] removed leftover merge marker

---
 nixos/roles/default.nix | 1 -
 1 file changed, 1 deletion(-)

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)
 }