From b15e701fd461a836b2c730ff6063c199593be7a7 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Tue, 6 Jun 2023 10:41:10 -0700
Subject: [PATCH] Fix conflict

---
 domains/sea.fudo.org.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/domains/sea.fudo.org.nix b/domains/sea.fudo.org.nix
index 723350c..9b682c7 100644
--- a/domains/sea.fudo.org.nix
+++ b/domains/sea.fudo.org.nix
@@ -12,12 +12,8 @@
 
   ldap-servers = [ "nutboy3" "legatus" ];
 
-<<<<<<< HEAD
   postgresql-server = "nostromo";
-=======
   kerberos-master = "nostromo";
-  # kerberos-slaves = [ "lambda" ];
->>>>>>> 45f0457328e0bdf5dbc6c103af0d703d46d9a2b2
 
   prometheus-hosts = [ "limina" ];
   grafana-hosts = [ "nostromo" ];