Resolve conflict in issue_board_entity.rb

6cb5bdd8 · Brett Walker · 2a5ffe69 · 6cb5bdd8
Commit 6cb5bdd8 authored Dec 05, 2018 by Brett Walker
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/serializers/issue_board_entity.rb
+++ b/app/serializers/issue_board_entity.rb
@@ -2,10 +2,7 @@
 class IssueBoardEntity < Grape::Entity
  include RequestAwareEntity
-<<<<<<< HEAD
  prepend ::EE::IssueBoardEntity
-=======
->>>>>>> upstream/master
  expose :id
  expose :iid