Commit 2c82998a authored by Ash McKenzie's avatar Ash McKenzie

Resolve conflicts in app/serializers/project_mirror_entity.rb

parent 6bca1fee
class ProjectMirrorEntity < Grape::Entity
<<<<<<< HEAD
prepend ::EE::ProjectMirrorEntity
=======
>>>>>>> upstream/master
expose :id
expose :remote_mirrors_attributes do |project|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment