Resolve API conflicts

900582e6 · Lin Jen-Shin · 634d52be · 900582e6 · 900582e6
Commit 900582e6 authored Mar 07, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

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

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

No files found.
--- a/lib/api/job_artifacts.rb
+++ b/lib/api/job_artifacts.rb
@@ -9,11 +9,8 @@ module API
      end
    end
-<<<<<<< HEAD
    prepend EE::API::JobArtifacts
-=======
->>>>>>> upstream/master
    params do
      requires :id, type: String, desc: 'The ID of a project'
    end

--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -32,11 +32,8 @@ module API
      ]
    end
-<<<<<<< HEAD
    prepend EE::API::MergeRequests
-=======
->>>>>>> upstream/master
    helpers do
      def find_merge_requests(args = {})
        args = declared_params.merge(args)