Merging in maps

app/assets/javascripts/darkswarm/directives/flash.js.coffee

@@ -16,7 +16,7 @@ Darkswarm.directive "ofnFlash", (flash, $timeout, RailsFlashLoader)->
     show = (message, type)=>
       if message
         $scope.flashes.push({message: message, type: typePairings[type]})
-        $timeout($scope.delete, 5000)
+        $timeout($scope.delete, 10000)
 
     $scope.delete = ->
       $scope.flashes.shift()

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 @