From aeb8af0e88e7941713481b6aeab1221aa313e49c Mon Sep 17 00:00:00 2001
From: Xe <me@christine.website>
Date: Sat, 14 May 2022 19:49:59 +0000
Subject: [PATCH] remove merge conflict

Signed-off-by: Xe <me@christine.website>
---
 hosts/kos-mos/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hosts/kos-mos/default.nix b/hosts/kos-mos/default.nix
index 8b8f766..d983701 100644
--- a/hosts/kos-mos/default.nix
+++ b/hosts/kos-mos/default.nix
@@ -9,8 +9,6 @@
 
   networking.hostName = "kos-mos";
   networking.hostId = "472479d4";
-<<<<<<< HEAD
-=======
 
   xeserv.services.robocadey.enable = true;
   age.secrets.robocadey = {
@@ -18,5 +16,4 @@
     path = "/var/lib/private/xeserv.robocadey/.env";
     mode = "0666";
   };
->>>>>>> 8c3057c (fix???)
 }