resolve conflict in `app/models/ci/build.rb`

cbd71ca5 · Lukas Eipert · 92962d07 · cbd71ca5
Commit cbd71ca5 authored Aug 02, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/ci/build.rb app/models/ci/build.rb +0 -3

No files found.
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -8,11 +8,8 @@ module Ci
    include Importable
    include Gitlab::Utils::StrongMemoize

-<<<<<<< HEAD
    prepend EE::Ci::Build

-=======
->>>>>>> upstream/master
    belongs_to :project, inverse_of: :builds
    belongs_to :runner
    belongs_to :trigger_request