remove git conflict heading
Flake checks / Check (pull_request) Successful in 6m0s Details

Hendrik Sokolowski 2024-04-27 22:28:56 +02:00
parent 4f86c92941
commit a01dc9928f
Signed by: hensoko
GPG Key ID: 5C36A01B80BCCC59
1 changed files with 0 additions and 1 deletions

View File

@ -1,5 +1,4 @@
let
<<<<<<< HEAD
admins = import ../logins/admins.nix;
nachtigall-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7G0ufi+MNvaAZLDgpieHrABPGN7e/kD5kMFwSk4ABj root@nachtigall";