fix rebase conflict

This commit is contained in:
differentreality 2013-08-16 16:09:29 +03:00
parent 69efd2619a
commit 4d2f0e2111

View file

@ -1,7 +1,8 @@
class CallForPapers < ActiveRecord::Base
attr_accessible :start_date, :end_date, :hard_deadline, :description, :schedule_changes
attr_accessible :start_date, :end_date, :hard_deadline, :description, :schedule_changes, :rating, :rating_desc
belongs_to :conference
validates_presence_of :start_date, :end_date, :hard_deadline
validates :rating, :numericality => { :greater_than_or_equal_to => 2, :less_than_or_equal_to => 10 }
end
end