Resolve app/models/concerns/protected_ref_access.rb

ffccc4e8 · Robert Speicher · 9fdb7498 · ffccc4e8
Commit ffccc4e8 authored Sep 18, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/models/concerns/protected_ref_access.rb
+++ b/app/models/concerns/protected_ref_access.rb
@@ -2,11 +2,8 @@

 module ProtectedRefAccess
  extend ActiveSupport::Concern
-<<<<<<< HEAD
  include EE::ProtectedRefAccess::Scopes
  prepend EE::ProtectedRefAccess
-=======
->>>>>>> upstream/master

  HUMAN_ACCESS_LEVELS = {
    Gitlab::Access::MAINTAINER => "Maintainers".freeze,