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

d19f3bc5 · Stan Hu · e31f6f8e · d19f3bc5
Commit d19f3bc5 authored Aug 18, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/groups/destroy_service.rb app/services/groups/destroy_service.rb +0 -3

No files found.
--- 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