mirror of
https://github.com/Theodor-Springmann-Stiftung/KGPZ.git
synced 2025-10-28 16:45:31 +00:00
Merge conflict pressburg solved
This commit is contained in:
10
XML/orte.xml
10
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">
|
||||
|
||||
Reference in New Issue
Block a user