Resolve app/services/milestones/update_service.rb

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

Showing with 0 additions and 3 deletions

app/services/milestones/update_service.rb app/services/milestones/update_service.rb +0 -3

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

 module Milestones
  class UpdateService < Milestones::BaseService
-<<<<<<< HEAD
    prepend EE::Milestones::UpdateService

-=======
->>>>>>> upstream/master
    # rubocop: disable CodeReuse/ActiveRecord
    def execute(milestone)
      state = params[:state_event]