fix conflicts

app/views/admin/users/_form.html.haml

@@ -3,12 +3,7 @@
     = f.input :is_admin, hint: 'An admin can create a new conference, manage users and make other users admins.'
     = f.input :name, :as => :string
     = f.input :email
-    = f.input :affiliation, as: :string
-    = f.input :biography, input_html: { rows: 5, "onkeyup" => "word_count(this, 'biography-count', 150)" }
-    You have used
-    %span#biography-count #{@user.biography_word_count}
-    words.  Biographies are limited to 150 words.
-    %br
-    %br
+    = f.input :affiliation, :as => :string
+    = f.input :biography, :input_html => {:rows => 10}
     = f.actions do
-      = f.action :submit, button_html: { class: 'btn btn-primary' }
+      = f.action :submit, :button_html => {:class => "btn btn-primary"}

app/views/proposal/_form.html.haml

@@ -71,7 +71,7 @@
           data.formData = inputs.serializeArray();
       });
       $.getJSON($('#fileupload').prop('action'), function (files) {
-        var fu = $('#fileupload').data('blueimpFileupload'),
+        var fu = $('#fileupload').data('fileupload'),
           template;
         fu._adjustMaxNumberOfFiles(-files.length);
         template = fu._renderDownload(files)

app/views/proposal/new.html.haml

@@ -1,6 +1,6 @@
 .row
   .col-md-12
-    = simple_format(@conference.call_for_papers.description) if @conference.call_for_papers
+    = simple_format(@conference.call_for_papers.description)
 .row
   .col-md-12
     = render 'proposal_form'