From c027d62d5d936c81a09d0585a614c21780c532fb Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Thu, 5 Apr 2012 12:05:48 +0100 Subject: remove merge code :( --- web/js/map-OpenLayers.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 9d8974fb6..8ea54cac3 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -480,11 +480,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { fixmystreet.map.getProjectionObject() ); var p = fixmystreet.map.getViewPortPxFromLonLat(lonlat); -<<<<<<< HEAD p.x -= ( o.left - bo.left + w ) / 2; -======= - p.x -= ( o.left + w ) / 2; ->>>>>>> send-report-rewrite lonlat = fixmystreet.map.getLonLatFromViewPortPx(p); fixmystreet.map.panTo(lonlat); } -- cgit v1.2.3