Resolve conflicts in `lib/api/entities.rb`

4b2c48e2 · Bob Van Landuyt · fc95af05 · 4b2c48e2
Commit 4b2c48e2 authored May 17, 2017 by Bob Van Landuyt
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
@@ -61,7 +61,6 @@ module API
      expose :project_id, :issues_events, :merge_requests_events
      expose :note_events, :pipeline_events, :wiki_page_events
      expose :job_events
-<<<<<<< HEAD
    end

    class ProjectPushRule < Grape::Entity
@@ -69,8 +68,6 @@ module API
      expose :commit_message_regex, :deny_delete_tag
      expose :member_check, :prevent_secrets, :author_email_regex
      expose :file_name_regex, :max_file_size
-=======
->>>>>>> upstream/master
    end

    class BasicProjectDetails < Grape::Entity