From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 30 Sep 2016 19:53:30 +0000 (+0200)
Subject: fix merge error
X-Git-Tag: deploy~423
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c792691c5280458499d6e3a6b657bd4cb9661d36?hp=c792691c5280458499d6e3a6b657bd4cb9661d36

fix merge error
---