VRFS-3459 removed errand git merge inserts

web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee

@@ -2,6 +2,7 @@ context = window
 logger = context.JK.logger
 ReactCSSTransitionGroup = React.addons.CSSTransitionGroup;
 
+
 mixins = []
 
 
@@ -59,6 +60,7 @@ mixins.push(Reflux.listenTo(JamTrackStore, 'onJamTrackChanged'))
 
     @setState(@updateFromMixerHelper(mixers, session))
 
+
   onMediaStateChanged: (changes) ->
     if changes.currentTimeChanged && @root?
       @setState({time: changes.time})
@@ -373,7 +375,6 @@ mixins.push(Reflux.listenTo(JamTrackStore, 'onJamTrackChanged'))
           </div>`
 
 
->>>>>>> develop
 
     else if @state.media.mediaSummary.backingTrackOpen
       mediaType = "Audio File"
@@ -510,6 +511,7 @@ mixins.push(Reflux.listenTo(JamTrackStore, 'onJamTrackChanged'))
         msg = "#{guess} minutes"
       alert("Your custom mix will take about #{msg} to be created.")
 
+
   createMix: (e) ->
     e.preventDefault()
 
@@ -631,4 +633,5 @@ mixins.push(Reflux.listenTo(JamTrackStore, 'onJamTrackChanged'))
   componentWillUpdate: (nextProps, nextState) ->
     @computeDisableLoading(nextState)
 
+
 })