From d19f3bc53e0d3722ab0b4d42e635afb803236883 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 18 Aug 2018 21:17:12 -0700
Subject: [PATCH] Resove conflicts in app/services/groups/destroy_service.rb
---
app/services/groups/destroy_service.rb | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb
index b5d11860f5f0f..b00384ee2b84b 100644
--- a/app/services/groups/destroy_service.rb
+++ b/app/services/groups/destroy_service.rb
@@ -2,11 +2,8 @@
module Groups
class DestroyService < Groups::BaseService
-<<<<<<< HEAD
prepend ::EE::Groups::DestroyService
-=======
->>>>>>> upstream/master
DestroyError = Class.new(StandardError)
def async_execute
--
GitLab