Merge conflict pressburg solved

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

View File

@@ -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">