From f653d7d3530ee4f1a9f0a9f2c78ce8dedb4e1ead Mon Sep 17 00:00:00 2001
From: Christian Koptein <christian.koptein@orgadata.com>
Date: Wed, 26 Jun 2024 10:29:12 +0200
Subject: [PATCH] merged hosts

---
 sshconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sshconfig b/sshconfig
index db28bb0..068f06b 100644
--- a/sshconfig
+++ b/sshconfig
@@ -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