Resolve conflicts in app/serializers/build_details_entity.rb

a8c13759 · Lukas Eipert · 36cb8d58 · a8c13759
Commit a8c13759 authored Oct 05, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/serializers/build_details_entity.rb app/serializers/build_details_entity.rb +0 -3

No files found.
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
 # frozen_string_literal: true

 class BuildDetailsEntity < JobEntity
-<<<<<<< HEAD
  prepend ::EE::BuildDetailEntity

-=======
->>>>>>> upstream/master
  expose :coverage, :erased_at, :duration
  expose :tag_list, as: :tags
  expose :has_trace?, as: :has_trace