Resolve app/services/keys/destroy_service.rb

f8e548a0 · Robert Speicher · 87fdd686 · f8e548a0
Commit f8e548a0 authored May 17, 2018 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/services/keys/destroy_service.rb
+++ b/app/services/keys/destroy_service.rb
 module Keys
  class DestroyService < ::Keys::BaseService
-<<<<<<< HEAD
    prepend EE::Keys::DestroyService
-=======
->>>>>>> upstream/master
    def execute(key)
      key.destroy if destroy_possible?(key)
    end