Resolving conflict with app/services/lfs/lock_file_service.rb

d963e138 · Ian Baum · 9966b360 · d963e138
Commit d963e138 authored Feb 07, 2018 by Ian Baum
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/lfs/lock_file_service.rb app/services/lfs/lock_file_service.rb +0 -3

No files found.
--- a/app/services/lfs/lock_file_service.rb
+++ b/app/services/lfs/lock_file_service.rb
 module Lfs
  class LockFileService < BaseService
-<<<<<<< HEAD
    prepend EE::Lfs::LockFileService

-=======
->>>>>>> upstream/master
    def execute
      unless can?(current_user, :push_code, project)
        raise Gitlab::GitAccess::UnauthorizedError, 'You have no permissions'