fixing conflicts [#8]

2015-07-18 17:30:31 +02:00
parent eb083c700b 370924a377
commit 12d35085e0
2 changed files with 3 additions and 2 deletions
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -1,5 +1,6 @@
 class Debate < ActiveRecord::Base
  acts_as_taggable
+
  belongs_to :author, class_name: 'User', foreign_key: 'author_id'

  validates :title, presence: true