Resolve conflicts in app/models/group.rb

8a5b3f8d · Stan Hu · f30448e8 · 8a5b3f8d
Commit 8a5b3f8d authored Mar 24, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -206,7 +206,6 @@ class Group < Namespace
    owners.include?(user) && owners.size == 1
  end

-<<<<<<< HEAD
  def human_ldap_access
    Gitlab::Access.options_with_owner.key ldap_access
  end
@@ -224,8 +223,6 @@ class Group < Namespace
    Gitlab.config.ldap.enabled && ldap_group_links.any?(&:active?)
  end

-=======
->>>>>>> upstream/master
  def post_create_hook
    Gitlab::AppLogger.info("Group \"#{name}\" was created")