From 6adcfdc472a76cd0390a3dd32ca34409d76e4800 Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Mon, 22 Feb 2016 08:30:58 -0300
Subject: [PATCH] fix merge mistake

---
 app/models/article.rb                  |  5 +----
 plugins/people_block/lib/ext/person.rb | 10 ----------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 plugins/people_block/lib/ext/person.rb

diff --git a/app/models/article.rb b/app/models/article.rb
index 82c3842..82fddb1 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -77,15 +77,12 @@ class Article < ActiveRecord::Base
   belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
   belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
 
-<<<<<<< 6fa2f904983046ed816efe293ba9dcad19a67a4b
   has_many :comments, :class_name => 'Comment', :as => 'source', :dependent => :destroy, :order => 'created_at asc'
 
-=======
-  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
   has_many :article_followers, :dependent => :destroy
   has_many :person_followers, :class_name => 'Person', :through => :article_followers, :source => :person
   has_many :person_followers_emails, :class_name => 'User', :through => :person_followers, :source => :user, :select => :email
->>>>>>> Add feature: Article Followers
+
   has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false }
   has_many :categories, :through => :article_categorizations
 
diff --git a/plugins/people_block/lib/ext/person.rb b/plugins/people_block/lib/ext/person.rb
deleted file mode 100644
index c36d34d..0000000
--- a/plugins/people_block/lib/ext/person.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_dependency 'person'
-
-class Person
-
-  scope :with_role, -> role_id {
-    joins(:role_assignments).
-    where("role_assignments.role_id = #{role_id}")
-  }
-
-end
--
libgit2 0.21.2