Fix merge conflicts

This commit is contained in:
decabeza
2019-04-29 14:22:22 +02:00
parent 51ced318e0
commit 99023a01c9

View File

@@ -4,6 +4,11 @@ class Poll < ApplicationRecord
include ActsAsParanoidAliases include ActsAsParanoidAliases
include Notifiable include Notifiable
translates :name, touch: true
translates :summary, touch: true
translates :description, touch: true
include Globalizable
RECOUNT_DURATION = 1.week RECOUNT_DURATION = 1.week
has_many :booth_assignments, class_name: "Poll::BoothAssignment" has_many :booth_assignments, class_name: "Poll::BoothAssignment"