CE->EE: Resolve conflicts in app/serializers/project_mirror_entity.rb

97cf87ea · Nick Thomas · 3eb6315e · 97cf87ea
Commit 97cf87ea authored Nov 20, 2018 by Nick Thomas
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
@@ -3,11 +3,8 @@
 class ProjectMirrorEntity < Grape::Entity
  prepend ::EE::ProjectMirrorEntity

-<<<<<<< HEAD
  expose :id

-=======
->>>>>>> upstream/master
  expose :remote_mirrors_attributes, using: RemoteMirrorEntity do |project|
    project.remote_mirrors
  end