Resolve app/services/users/destroy_service.rb

7a709b84 · Valery Sizov · ebdafe97 · 7a709b84
Commit 7a709b84 authored Aug 20, 2018 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/services/users/destroy_service.rb
+++ b/app/services/users/destroy_service.rb
@@ -2,11 +2,8 @@

 module Users
  class DestroyService
-<<<<<<< HEAD
    prepend ::EE::Users::DestroyService

-=======
->>>>>>> upstream/master
    DestroyError = Class.new(StandardError)

    attr_accessor :current_user