fix merge conflicts for export page

UFPE · Apr 27, 2015 · ffb8d84 · ffb8d84
2 parents 896523b + 75b36de
commit ffb8d84
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/app/views/problems/_filter.html.haml b/app/views/problems/_filter.html.haml
@@ -9,17 +9,6 @@
     = label_tag(:tags, "Tags:")
     = text_field_tag(:tags, params[:tags], class: 'form-control', placeholder: "e.g.: tag 1,tag 2")
 
-
-  = label_tag(:tags, "Collections:")
-  - @collections.each do |collection|
-    %div.checkbox
-      %label
-        -if @chosen_collections.include? collection.name
-          = check_box_tag "collections[#{collection.name}]", 1, true, class: "checkbox"
-        -else
-          = check_box_tag "collections[#{collection.name}]", 1, false, class: "checkbox"
-        = collection.name
-
   %div.form-group
     = label_tag(:last_exported, "Last Exported:")
     = text_field_tag(:last_exported_begin, params[:last_exported_begin], class: 'form-control', placeholder: "dd/mm/yyyy")