Fix incorrect merge conflict resolution in `ProtectedBranchAccess`.

Lines were duplicated.

Fix incorrect merge conflict resolution in `ProtectedBranchAccess`.
Lines were duplicated.
a11dd013 · Timothy Andrew · aefea581 · a11dd013
Commit a11dd013 authored Oct 26, 2016 by Timothy Andrew
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/concerns/protected_branch_access.rb app/models/concerns/protected_branch_access.rb +0 -3

No files found.
--- a/app/models/concerns/protected_branch_access.rb
+++ b/app/models/concerns/protected_branch_access.rb
@@ -21,9 +21,6 @@ module ProtectedBranchAccess
    else
      :role
    end
-
-    scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
-    scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
  end

  def humanize