Resolve app/services/applications/create_service.rb

5816c292 · Robert Speicher · 0308511b · 5816c292
Commit 5816c292 authored Sep 13, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/applications/create_service.rb app/services/applications/create_service.rb +0 -3

No files found.
--- a/app/services/applications/create_service.rb
+++ b/app/services/applications/create_service.rb
@@ -2,11 +2,8 @@
 module Applications
  class CreateService
-<<<<<<< HEAD
    prepend ::EE::Applications::CreateService
-=======
->>>>>>> upstream/master
    # rubocop: disable CodeReuse/ActiveRecord
    def initialize(current_user, params)
      @current_user = current_user