Skip to content
Snippets Groups Projects
Commit 32c41f4d authored by Mateus Rambo Strey's avatar Mateus Rambo Strey
Browse files

fix merge error

parent 7bc83392
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 3 deletions
app/models/user.rb
+ 0
− 3
View file @ 32c41f4d
...@@ -87,13 +87,11 @@ class User < ActiveRecord::Base ...@@ -87,13 +87,11 @@ class User < ActiveRecord::Base
false false
end end
<<<<<<< HEAD
def associated_collections def associated_collections
c = collections.blank? ? [] : collections.includes(:owner) c = collections.blank? ? [] : collections.includes(:owner)
c + Collection.where(owner: institutions).includes(:owner) c + Collection.where(owner: institutions).includes(:owner)
end end
=======
# ~~~~ followable actions ~~~~ # # ~~~~ followable actions ~~~~ #
# An user can follow anothers users and collections # An user can follow anothers users and collections
# Examples: # Examples:
...@@ -119,7 +117,6 @@ class User < ActiveRecord::Base ...@@ -119,7 +117,6 @@ class User < ActiveRecord::Base
end end
# ~~~~ end followable actions ~~~~ # # ~~~~ end followable actions ~~~~ #
>>>>>>> railsapi
private private
def default_role def default_role
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment