From 68e50a17829b34faeab837916c1a532a16ca597b Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Thu, 9 Apr 2015 07:00:53 -0300
Subject: [PATCH] fixing conflit with next

---
 app/models/comment.rb                                |  2 --
 db/migrate/20140505190748_add_setting_to_comments.rb |  9 ---------
 2 files changed, 0 insertions(+), 11 deletions(-)
 delete mode 100644 db/migrate/20140505190748_add_setting_to_comments.rb

diff --git a/app/models/comment.rb b/app/models/comment.rb
index cd317ec..0edd62b 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -44,8 +44,6 @@ class Comment < ActiveRecord::Base
     end
   end
   
-  acts_as_having_settings :field => :setting
-
   acts_as_having_settings
 
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
diff --git a/db/migrate/20140505190748_add_setting_to_comments.rb b/db/migrate/20140505190748_add_setting_to_comments.rb
deleted file mode 100644
index 61bf704..0000000
--- a/db/migrate/20140505190748_add_setting_to_comments.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddSettingToComments < ActiveRecord::Migration
-  def self.up
-    add_column :comments, :setting, :text
-  end
-
-  def self.down
-    remove_column :comments, :setting
-  end
-end
--
libgit2 0.21.2