Resolve conflicts in `lib/gitlab/git_access.rb`

24f61e6b · Bob Van Landuyt · 35c33526 · 24f61e6b
Commit 24f61e6b authored May 11, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/git_access.rb lib/gitlab/git_access.rb +0 -3

No files found.
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -2,13 +2,10 @@
 # class return an instance of `GitlabAccessStatus`
 module Gitlab
  class GitAccess
-<<<<<<< HEAD
    prepend ::EE::Gitlab::GitAccess
    include ActionView::Helpers::SanitizeHelper
    include PathLocksHelper

-=======
->>>>>>> upstream/master
    UnauthorizedError = Class.new(StandardError)
    NotFoundError = Class.new(StandardError)
    ProjectCreationError = Class.new(StandardError)