Resolve conflict in app/serializers/merge_request_widget_entity.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/serializers/merge_request_widget_entity.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
bbe30aaf · Rémy Coutable · 03c1870a · bbe30aaf
Commit bbe30aaf authored Dec 21, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/serializers/merge_request_widget_entity.rb
+++ b/app/serializers/merge_request_widget_entity.rb
 class MergeRequestWidgetEntity < IssuableEntity
-<<<<<<< HEAD:app/serializers/merge_request_widget_entity.rb
  prepend ::EE::MergeRequestWidgetEntity

-=======
->>>>>>> upstream/master:app/serializers/merge_request_widget_entity.rb
  expose :state
  expose :in_progress_merge_commit_sha
  expose :merge_commit_sha