Fixed conflict in group model

b0bef50c · Jan Provaznik · f8126dee · b0bef50c
Commit b0bef50c authored Jul 05, 2018 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

app/models/group.rb app/models/group.rb +0 -5

No files found.
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -87,12 +87,7 @@ class Group < Namespace
    end

    def public_or_visible_to_user(user)
-<<<<<<< HEAD
-      where(
-        'id IN (?) OR namespaces.visibility_level IN (?)',
-=======
      where('id IN (?) OR namespaces.visibility_level IN (?)',
->>>>>>> upstream/master
        user.authorized_groups.select(:id),
        Gitlab::VisibilityLevel.levels_for_user(user))
    end