pub-solar/infra
6
1
Fork 3
Code Issues 23 Pull requests 10 Actions Packages Projects 1 Releases Wiki Activity

remove git conflict heading

Browse source
This commit is contained in:
Hendrik Sokolowski 2024-04-27 22:28:56 +02:00
parent d280b29394
commit c74394449d
Signed by: hensoko
GPG key ID: 5C36A01B80BCCC59
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
secrets/secrets.nix
View file

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