From 7953ff145c39812f098df0854bde1a03f687a2ff Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Fri, 6 Jun 2014 17:23:28 +1000 Subject: [PATCH] Fixing a merge issue --- app/views/map/index.html.haml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml index a128c61872..9fec2290d8 100644 --- a/app/views/map/index.html.haml +++ b/app/views/map/index.html.haml @@ -1,9 +1,3 @@ -<<<<<<< HEAD -- content_for :scripts do - %script{src: "//maps.googleapis.com/maps/api/js?sensor=false"} - -======= ->>>>>>> master = inject_json "enterprisesForMap" , "enterprises_for_map", collection: @enterprises .ofn-map-container{"fill-vertical" => true}