Resolve conflicts in api/entities

7c088f2f · Jarka Kadlecová · 3082f7cc · 7c088f2f
Commit 7c088f2f authored Feb 14, 2018 by Jarka Kadlecová
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/api/entities.rb lib/api/entities.rb +0 -3

No files found.
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -309,13 +309,10 @@ module API
      expose :status
      expose :last_pipeline, using: 'API::Entities::PipelineBasic'
      expose :project_id
-<<<<<<< HEAD
-=======
    end
    class BasicRef < Grape::Entity
      expose :type, :name
->>>>>>> upstream/master
    end
    class Branch < Grape::Entity