From 040b901e41f4a6d0917ee11b2ae0c551791bb2eb Mon Sep 17 00:00:00 2001
From: George Saines <gsaines@gmail.com>
Date: Thu, 11 Sep 2014 11:08:25 -0700
Subject: [PATCH] removed merge junk
---
app/views/play/level/LevelPlaybackView.coffee | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/app/views/play/level/LevelPlaybackView.coffee b/app/views/play/level/LevelPlaybackView.coffee
index 0bb7a1bef..6949fce6e 100644
--- a/app/views/play/level/LevelPlaybackView.coffee
+++ b/app/views/play/level/LevelPlaybackView.coffee
@@ -339,11 +339,8 @@ module.exports = class LevelPlaybackView extends CocoView
@slideCount = 0
@wasPlaying = @playing
Backbone.Mediator.publish 'level:set-playing', {playing: false}
-<<<<<<< HEAD
- Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-start', volume: .01
-=======
Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-start', volume: 0.5
->>>>>>> 8c37fabe7990e8409591fee65c18593bb64aee5c
+
stop: (event, ui) =>
return if @shouldIgnore()
@@ -355,11 +352,8 @@ module.exports = class LevelPlaybackView extends CocoView
Backbone.Mediator.publish 'level:set-playing', {playing: false}
@$el.find('.scrubber-handle').effect('bounce', {times: 2})
else
-<<<<<<< HEAD
- Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-end', volume: .01
-=======
Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-end', volume: 0.5
->>>>>>> 8c37fabe7990e8409591fee65c18593bb64aee5c
+
)
getScrubRatio: ->