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

obs-portal: init obs-portal on nachtigall #115

Merged
teutat3s merged 5 commits from feat/obs-portal-nachtigall into main 2024-04-27 23:14:50 +00:00
Conversation 1 Commits 5 Files changed 6 -1
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c74394449d - Show all commits

1
secrets/secrets.nix
View file

@ -1,5 +1,4 @@
let let
<<<<<<< HEAD
admins = import ../logins/admins.nix; admins = import ../logins/admins.nix;
teutat3s commented 2024-04-27 20:00:29 +00:00
Outdated
Review
Copy link

Merge conflict leftover

Merge conflict leftover
nachtigall-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7G0ufi+MNvaAZLDgpieHrABPGN7e/kD5kMFwSk4ABj root@nachtigall"; nachtigall-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7G0ufi+MNvaAZLDgpieHrABPGN7e/kD5kMFwSk4ABj root@nachtigall";