From 99023a01c95d4c172c93e6ce19075813b5f96317 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Mon, 29 Apr 2019 14:22:22 +0200
Subject: [PATCH] Fix merge conflicts

---
 app/models/poll.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/poll.rb b/app/models/poll.rb
index 895ac48c7..b4e69a7bc 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -4,6 +4,11 @@ class Poll < ApplicationRecord
   include ActsAsParanoidAliases
   include Notifiable
 
+  translates :name,        touch: true
+  translates :summary,     touch: true
+  translates :description, touch: true
+  include Globalizable
+
   RECOUNT_DURATION = 1.week
 
   has_many :booth_assignments, class_name: "Poll::BoothAssignment"