fix rebase conflict

This commit is contained in:
differentreality 2013-08-16 16:08:38 +03:00
parent 96d14f14de
commit 69efd2619a

View file

@ -12,3 +12,5 @@
= 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"}
= f.input :rating_desc, :label => "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"}