From c74394449d1d08982ee138cf74dfcc2d7c2b3817 Mon Sep 17 00:00:00 2001
From: Hendrik Sokolowski <hensoko@gssws.de>
Date: Sat, 27 Apr 2024 22:28:56 +0200
Subject: [PATCH] remove git conflict heading

---
 secrets/secrets.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 32090c20..9c40bfb9 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,5 +1,4 @@
 let
-<<<<<<< HEAD
   admins = import ../logins/admins.nix;
 
   nachtigall-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7G0ufi+MNvaAZLDgpieHrABPGN7e/kD5kMFwSk4ABj root@nachtigall";