Theodor-Springmann-Stiftung/KGPZ
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/KGPZ.git synced 2025-10-29 09:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict pressburg solved

Browse Source
This commit is contained in:
Simon Martens
2025-09-28 18:03:38 +02:00
parent bcda616461
commit a3d0af4b0b
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
XML/orte.xml
View File

@@ -540,17 +540,7 @@
<ort id="pressburg"> <ort id="pressburg">
<name>Pressburg</name> <name>Pressburg</name>
<
<
<
<
<
<
< HEAD
<geonames>https://www.geonames.org/3343955</geonames>
=======
<geonames>https://www.geonames.org/3060972</geonames> <geonames>https://www.geonames.org/3060972</geonames>
>>>>>>> ef536ade486ce8d4d8c4f0daa69a347d4e71d223
</ort> </ort>
<ort id="warschau"> <ort id="warschau">