Commit 04739e57 authored by Stan Hu's avatar Stan Hu

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

parent d0889621
......@@ -11,8 +11,5 @@ module Projects
end
end
end
<<<<<<< HEAD
Projects::DisableDeployKeyService.prepend(EE::Projects::DisableDeployKeyService)
=======
>>>>>>> upstream/master
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment