diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-06-25 16:53:57 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-06-25 16:53:57 +0100 |
| commit | 69cd6c024ae2a5d7035e2942745c61311b6f1c17 (patch) | |
| tree | 6e76ef366d9276ddfac3251d050c353624cd712a /web/js/map-OpenLayers.js | |
| parent | 466b66917aa33b1b50cd35d447c2033c47cf45cb (diff) | |
delete overlooked conflict marker?
Diffstat (limited to 'web/js/map-OpenLayers.js')
| -rw-r--r-- | web/js/map-OpenLayers.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index eca1fc074..4c96e771c 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -70,7 +70,6 @@ function fms_markers_list(pins, transform) { } function fixmystreet_onload() { -<<<<<<< HEAD if ( fixmystreet.area.length ) { for (var i=0; i<fixmystreet.area.length; i++) { var area = new OpenLayers.Layer.Vector("KML", { |