Merge markers, whoops

msokk · Mar 25, 2012 · 7621a74 · 7621a74
1 parent 6f77e41
commit 7621a74
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/lib/public/js/app_client.js b/lib/public/js/app_client.js
@@ -162,19 +162,13 @@ $(function() {
     stopTrack: function(){
       $("#speaker-animation").hide();
       clearInterval(ms.trackInterval);
-<<<<<<< HEAD
-      ms.player.pause();
-
-      // Reload
-=======
       ms.player && ms.player.pause();
       ms.payloadQueue = [];
-      
+
       $("#speaker-on").show();
       $("#speaker-animation").hide();
-      
+
       // Fallback to reload
->>>>>>> 9738a139033cd7ae4114aac0e23484855876a42d
       document.location.reload();
     },