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