Skip to content
代码片段 群组 项目
提交 d19f3bc5 编辑于 作者: Stan Hu's avatar Stan Hu
浏览文件

Resove conflicts in app/services/groups/destroy_service.rb

上级 e31f6f8e
No related branches found
No related tags found
无相关合并请求
隐藏空白变更内容
行内 左右并排
app/services/groups/destroy_service.rb
+ 0
− 3
浏览文件 @ d19f3bc5
...@@ -2,11 +2,8 @@ ...@@ -2,11 +2,8 @@
module Groups module Groups
class DestroyService < Groups::BaseService class DestroyService < Groups::BaseService
<<<<<<< HEAD
prepend ::EE::Groups::DestroyService prepend ::EE::Groups::DestroyService
=======
>>>>>>> upstream/master
DestroyError = Class.new(StandardError) DestroyError = Class.new(StandardError)
def async_execute def async_execute
......
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或