Resolve conflicts in MergeRequests::BuildService

dc4dd1d2 · Sean McGivern · 274afd88 · dc4dd1d2
Commit dc4dd1d2 authored Feb 02, 2018 by Sean McGivern
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
 module MergeRequests
  class BuildService < MergeRequests::BaseService
-<<<<<<< HEAD
    prepend EE::MergeRequests::BuildService
-=======
->>>>>>> upstream/master
    include Gitlab::Utils::StrongMemoize

    def execute