From 2a2a09322c35c7cd7e0cd82ab7194e9fddb6ff2c Mon Sep 17 00:00:00 2001
From: PAN <dev.blackwallcloud@posteo.de>
Date: Sun, 21 Dec 2025 19:57:10 +0100
Subject: [PATCH] entfernung der merge verweise

---
 inventory.ini | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/inventory.ini b/inventory.ini
index cef7df7..3342bce 100644
--- a/inventory.ini
+++ b/inventory.ini
@@ -1,9 +1,2 @@
-<<<<<<< HEAD
 [MeinePC]
 kickdev
-=======
-[VMs]
-kickdev.local ansible_host=192.168.2.189
-[Mein-PC]
-Philip-PC ansible_host=192.168.2.162
->>>>>>> pan/HEAD