diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-02-29 09:25:20 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-02-29 09:25:20 +0000 |
| commit | d69defaee6e4a3d594737a42ea7390034fe0dbfb (patch) | |
| tree | b8c68befd7f8278b5b8bd530d4bfc65eae57b575 /web/js/map-bing-ol.js | |
| parent | 108e3c53e8fc6a9e2a9d9c1151647f049225ed96 (diff) | |
| parent | cecb11c2a73f7f86fc27914bcaee80e0454802c2 (diff) | |
Merge remote branch 'github/supercool' into supercool
Conflicts:
web/cobrands/fixmystreet/base.scss
web/js/map-OpenLayers.js
Diffstat (limited to 'web/js/map-bing-ol.js')
| -rw-r--r-- | web/js/map-bing-ol.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 4d01563a3..2786f63cf 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -9,7 +9,7 @@ function set_map_config(perm) { new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), - new OpenLayers.Control.Permalink(), + new OpenLayers.Control.Permalink('map_permalink'), new OpenLayers.Control.PanZoomFMS() ]; } |