entfernung der merge verweise

This commit is contained in:
PAN
2025-12-21 19:57:10 +01:00
parent 45cb38ebe5
commit 2a2a09322c

View File

@@ -1,9 +1,2 @@
<<<<<<< HEAD
[MeinePC] [MeinePC]
kickdev kickdev
=======
[VMs]
kickdev.local ansible_host=192.168.2.189
[Mein-PC]
Philip-PC ansible_host=192.168.2.162
>>>>>>> pan/HEAD