From 32c41f4d468273fc072f98d6ec08818fb7b5cb2c Mon Sep 17 00:00:00 2001
From: Mateus Rambo Strey <mars11@inf.ufpr.br>
Date: Tue, 12 Apr 2016 11:29:40 -0300
Subject: [PATCH] fix merge error

---
 app/models/user.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index f23956f1..8e8b476e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -87,13 +87,11 @@ class User < ActiveRecord::Base
     false
   end
 
-<<<<<<< HEAD
   def associated_collections
     c = collections.blank? ? [] : collections.includes(:owner)
     c + Collection.where(owner: institutions).includes(:owner)
   end
 
-=======
   # ~~~~ followable actions ~~~~ #
   # An user can follow anothers users and collections
   # Examples:
@@ -119,7 +117,6 @@ class User < ActiveRecord::Base
   end
   # ~~~~ end followable actions ~~~~ #
 
->>>>>>> railsapi
   private
 
   def default_role
-- 
GitLab