VRFS-3681 develop branch merge review

2015-11-08 23:05:34 +00:00 · 2015-11-08 23:05:34 +00:00 · 9df947097f
parent fb9a7c01af
commit 9df947097f
2 changed files with 1 additions and 2 deletions
--- a/web/app/views/clients/_help.html.slim
+++ b/web/app/views/clients/_help.html.slim
@ -367,4 +367,4 @@ script type="text/template" id="template-help-vid-record-chat-input"

 script type="text/template" id="template-help-first-time-jamtrack-web-player"
  .first-time-jamtrack-web-player
-    | Create custom mixes to mute parts, slow down playback, etc.
+    | Create custom mixes to mute parts, slow down playback, etc.
--- a/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb
+++ b/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb
@ -103,7 +103,6 @@ describe ApiJamTrackMixdownsController, type: :controller do

      json = JSON.parse(response.body)
      puts json
-
      json["id"].should eq(package.id)
      JamTrackMixdownPackage.count.should eq(1)
    end