From 69efd2619afb94f7ea8323b9dcbe188fecf7e173 Mon Sep 17 00:00:00 2001 From: differentreality Date: Fri, 16 Aug 2013 16:08:38 +0300 Subject: [PATCH] fix rebase conflict --- app/views/admin/callforpapers/show.html.haml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/admin/callforpapers/show.html.haml b/app/views/admin/callforpapers/show.html.haml index 0530183c..90bb4a73 100644 --- a/app/views/admin/callforpapers/show.html.haml +++ b/app/views/admin/callforpapers/show.html.haml @@ -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"}