Resolve app/services/merge_requests/update_service.rb

f8b8ab51 · Lin Jen-Shin · 6164651a · f8b8ab51
Commit f8b8ab51 authored Mar 06, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -111,7 +111,6 @@ module MergeRequests
    private
-<<<<<<< HEAD
    def reset_approvals(merge_request)
      target_project = merge_request.target_project
@@ -120,8 +119,6 @@ module MergeRequests
      end
    end
-=======
->>>>>>> upstream/master
    def create_branch_change_note(issuable, branch_type, old_branch, new_branch)
      SystemNoteService.change_branch(
        issuable, issuable.project, current_user, branch_type,