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

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

diff --git a/XML/orte.xml b/XML/orte.xml
index 40485d8..c715f28 100644
--- a/XML/orte.xml
+++ b/XML/orte.xml
@@ -420,17 +420,7 @@
 
 	<ort id="liegnitz">
 		<name>Liegnitz</name>
-		<
-		<
-		<
-		<
-		<
-		<
-		< HEAD
 		<geonames>https://www.geonames.org/3093692</geonames>
-		=======
-		<geonames>https://www.geonames.org/7530968</geonames>
-		>>>>>>> ef536ade486ce8d4d8c4f0daa69a347d4e71d223
 	</ort>
 
 	<ort id="weimar">