merged hosts

2024-06-26 10:29:12 +02:00 · 2024-06-26 10:29:12 +02:00 · f653d7d353
commit f653d7d353
parent 513295fc07
1 changed files with 6 additions and 0 deletions
--- a/6
+++ b/6
@ -62,6 +62,7 @@ Host pihole
 Host azubiserver
    Hostname 10.10.21.40
    User root
+<<<<<<< Updated upstream
 Host jellyfin.vpn 
    Hostname 10.8.0.21
    User zul
@ -79,4 +80,9 @@ Host t590
    User zul
 Host wow
    Hostname 192.168.15.24
+Host azubivm
+    Hostname 10.10.20.63
+    User ckoptein
+Host ilias
+    Hostname 185.201.146.18
    User root