From c8520cedbb86ce25a51f1cccd46c1801c94eaa8c Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 6 Jun 2014 17:26:06 +1000
Subject: [PATCH] Fixing another merge issue

---
 .../javascripts/darkswarm/services/map.js.coffee       | 10 ----------
 app/assets/javascripts/templates/map_modal.html.haml   |  4 ----
 2 files changed, 14 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/map.js.coffee b/app/assets/javascripts/darkswarm/services/map.js.coffee
index 3405db592d..eb1a195490 100644
--- a/app/assets/javascripts/darkswarm/services/map.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map.js.coffee
@@ -6,17 +6,7 @@ Darkswarm.factory "OfnMap", (enterprisesForMap, MapModal)->
     # Adding methods to each enterprise
     extend: (enterprise)->
       new class MapMarker
-<<<<<<< HEAD
-        icon: "/test.opng"
-        constructor: ->
-          @[k] = v for k, v of enterprise
-
-        reveal: =>
-
-          console.log @
-=======
         constructor: ->
           @[k] = v for k, v of enterprise
         reveal: =>
->>>>>>> master
           MapModal.open @
diff --git a/app/assets/javascripts/templates/map_modal.html.haml b/app/assets/javascripts/templates/map_modal.html.haml
index cfe0f3bfbe..54c834253a 100644
--- a/app/assets/javascripts/templates/map_modal.html.haml
+++ b/app/assets/javascripts/templates/map_modal.html.haml
@@ -2,12 +2,8 @@
   .small-12.columns.producer-hero
     %h3.producer-name 
       %i.ofn-i_036-producers
-<<<<<<< HEAD
-      {{ producer.name }}
-=======
       {{ enterprise.name }}
       {{ enterprise.id }}
->>>>>>> master
     %img.producer-hero-img{"ng-src" => "{{enterprise.promo_image}}"} 
     
 .row