fix merge error

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 9c9b99fbdcd479e752b24c1770b4284c400cec6f..56b80a5c0b001a7585f6111032574fe2d52b9472 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -101,4 +101,3 @@ if ($sOutputFormat=='html') {
     $sTileAttribution = CONST_Map_Tile_Attribution;
 }
 include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
->>>>>>> upstream/master