From a3d0af4b0bda7e30638336b2f6ba75c2a2e37c3f Mon Sep 17 00:00:00 2001
From: Simon Martens <simon.martens@mailbox.org>
Date: Sun, 28 Sep 2025 18:03:38 +0200
Subject: [PATCH] Merge conflict pressburg solved

---
 XML/orte.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/XML/orte.xml b/XML/orte.xml
index c715f28..f3b079c 100644
--- a/XML/orte.xml
+++ b/XML/orte.xml
@@ -540,17 +540,7 @@
 
 	<ort id="pressburg">
 		<name>Pressburg</name>
-		<
-		<
-		<
-		<
-		<
-		<
-		< HEAD
-		<geonames>https://www.geonames.org/3343955</geonames>
-		=======
 		<geonames>https://www.geonames.org/3060972</geonames>
-		>>>>>>> ef536ade486ce8d4d8c4f0daa69a347d4e71d223
 	</ort>
 
 	<ort id="warschau">