Fixes resolution for enqueue build service

f8324c83 · Mayra Cabrera · 5a3bda13 · f8324c83
Commit f8324c83 authored Aug 10, 2018 by Mayra Cabrera
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/ci/enqueue_build_service.rb app/services/ci/enqueue_build_service.rb +0 -3

No files found.
--- a/app/services/ci/enqueue_build_service.rb
+++ b/app/services/ci/enqueue_build_service.rb
 # frozen_string_literal: true
 module Ci
  class EnqueueBuildService < BaseService
-<<<<<<< HEAD
    prepend EE::Ci::EnqueueBuildService
-=======
->>>>>>> upstream/master
    def execute(build)
      build.enqueue
    end