Resolve conflicts in app/serializers/project_mirror_entity.rb

2c82998a · Ash McKenzie · 6bca1fee · 2c82998a
Commit 2c82998a authored May 08, 2018 by Ash McKenzie
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/serializers/project_mirror_entity.rb
+++ b/app/serializers/project_mirror_entity.rb
 class ProjectMirrorEntity < Grape::Entity
-<<<<<<< HEAD
  prepend ::EE::ProjectMirrorEntity

-=======
->>>>>>> upstream/master
  expose :id

  expose :remote_mirrors_attributes do |project|