fix rebase conflict

This commit is contained in:
differentreality 2013-08-16 16:06:36 +03:00
parent 609b3d45fe
commit 96d14f14de

View file

@ -9,4 +9,6 @@
= f.input :hard_deadline, :as => :string, :input_html => { :id => "cfp-hard-datepicker", :readonly => "readonly" }
= f.input :description, :hint => "Welcome text for the Call for Papers"
= f.input :schedule_changes
= f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}
= f.input :rating, :hint => "Enter the number of different rating levels you want to have for voting on proposals."
= f.input :rating_description, :hint => "Enter comments about voting process.", :input_html => {:value => "1 is for 'I don't like this proposal',\n2 is for 'I am ok with this proposal.',\n3 is for 'I love this proposal!'", :rows => 5, :class => "span6"}
= f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}