From 403b22d8e03165ebaa606213311bd2b0b3f6a542 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Wed, 17 Sep 2025 20:15:59 +0200
Subject: [PATCH] remove merge artifact

---
 clan.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/clan.nix b/clan.nix
index 92e13a2..520d5ef 100644
--- a/clan.nix
+++ b/clan.nix
@@ -51,7 +51,7 @@
 
       roles.controller.machines."m1" = {};
     };
-    
+
     k3s = {
       module = {
         name = "@amarth/k3s";
@@ -59,10 +59,9 @@
       };
 
       roles.server.machines."c1" = {};
-      
+
       roles.agent.machines."c2" = {};
       roles.agent.machines."c3" = {};
->>>>>>> 81bc14dcb9b649451939a01d3828ca4c170dc897
     };
   };