Merge conflict liegnizs solved

This commit is contained in:
Simon Martens
2025-09-28 18:03:05 +02:00
parent af30364617
commit bcda616461

View File

@@ -420,17 +420,7 @@
<ort id="liegnitz"> <ort id="liegnitz">
<name>Liegnitz</name> <name>Liegnitz</name>
<
<
<
<
<
<
< HEAD
<geonames>https://www.geonames.org/3093692</geonames> <geonames>https://www.geonames.org/3093692</geonames>
=======
<geonames>https://www.geonames.org/7530968</geonames>
>>>>>>> ef536ade486ce8d4d8c4f0daa69a347d4e71d223
</ort> </ort>
<ort id="weimar"> <ort id="weimar">