Resolve conflicts in app/services/projects/disable_deploy_key_service.rb

04739e57 · Stan Hu · d0889621 · 04739e57
Commit 04739e57 authored Nov 19, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/projects/disable_deploy_key_service.rb app/services/projects/disable_deploy_key_service.rb +0 -3

No files found.
--- a/app/services/projects/disable_deploy_key_service.rb
+++ b/app/services/projects/disable_deploy_key_service.rb
@@ -11,8 +11,5 @@ module Projects
    end
  end
 end
-<<<<<<< HEAD
 Projects::DisableDeployKeyService.prepend(EE::Projects::DisableDeployKeyService)
-=======
->>>>>>> upstream/master