From 69cd6c024ae2a5d7035e2942745c61311b6f1c17 Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Mon, 25 Jun 2012 16:53:57 +0100
Subject: delete overlooked conflict marker?

---
 web/js/map-OpenLayers.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'web/js/map-OpenLayers.js')

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", {
-- 
cgit v1.2.3