remove git conflict heading
Flake checks / Check (pull_request) Successful in 6m0s
Details
Flake checks / Check (pull_request) Successful in 6m0s
Details
parent
4f86c92941
commit
a01dc9928f
|
@ -1,5 +1,4 @@
|
|||
let
|
||||
<<<<<<< HEAD
|
||||
admins = import ../logins/admins.nix;
|
||||
|
||||
nachtigall-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7G0ufi+MNvaAZLDgpieHrABPGN7e/kD5kMFwSk4ABj root@nachtigall";
|
||||
|
|
Loading…
Reference in New Issue