Resolve conflicts in app/services/issues/move_service.rb

1040d3a4 · Stan Hu · 3616bc1a · 1040d3a4
Commit 1040d3a4 authored Nov 12, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/issues/move_service.rb app/services/issues/move_service.rb +0 -3

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

 module Issues
  class MoveService < Issuable::Clone::BaseService
-<<<<<<< HEAD
    prepend ::EE::Issues::MoveService

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

    def execute(issue, target_project)