fixing merge conflicts

web/app/assets/javascripts/web/downloads.js

@@ -70,7 +70,6 @@
 
         var selectOthers = $(context._.template($('#client-download-select-others').html(), options, { variable: 'data' }));
 
-        
         // isolate active images for selectOthers
         $('div.hidden-images img[data-purpose=' + platformName1 + ']', selectOthers).remove().appendTo($('a[data-order=1]', selectOthers));
         $('div.hidden-images img[data-purpose=' + platformName2 + ']', selectOthers).remove().appendTo($('a[data-order=2]', selectOthers));

web/app/views/users/_download_templates.html.slim

@@ -1,4 +1,3 @@
-
 script type="text/template" id="client-download-blurb-contents"
   .downloads
 

web/app/views/users/downloads.html.erb

@@ -5,4 +5,4 @@
 
 <script type="text/javascript">
     $(function() { window.JK.Downloads.listClients(false) } );
-</script>
+</script>

web/spec/features/download_spec.rb

@@ -71,24 +71,24 @@ describe "Download", :js => true,  :type => :feature, :capybara_feature => true
 
     end
 
-    # describe "signin and goto downloads-page" do
-    #   before(:each) do
-    #     sign_in_poltergeist user
-    #   end
+    describe "signin and goto downloads-page" do
+      before(:each) do
+        sign_in_poltergeist user
+      end
 
-    #   describe :default_downloads_page do 
-    #     it_behaves_like :dowload_client do
-    #       let(:path){ "/downloads" }
-    #     end
-    #   end
+      describe :default_downloads_page do 
+        it_behaves_like :dowload_client do
+          let(:path){ "/downloads" }
+        end
+      end
   
-    #   describe :landing_downloads_page do
-    #     it_behaves_like :dowload_client do
-    #       let(:path){ "/landing/general/downloads" }
-    #     end
-    #   end
+      describe :landing_downloads_page do
+        it_behaves_like :dowload_client do
+          let(:path){ "/landing/general/downloads" }
+        end
+      end
 
-    # end
+    end
 
   end
 end