Fixing conflict in api.rb

271e91b6 · Francisco Javier López · 8b2d7690 · 271e91b6
Commit 271e91b6 authored May 31, 2018 by Francisco Javier López
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -23,7 +23,6 @@ module API
    prefix :api

    version 'v3', using: :path do
-<<<<<<< HEAD
      ## EE-specific API V3 endpoints START
      # Although the following endpoints are kept behind V3 namespace, they're not
      # deprecated neither should be removed when V3 get removed.
@@ -31,8 +30,6 @@ module API
      mount ::API::V3::Github
      ## EE-specific API V3 endpoints END

-=======
->>>>>>> upstream/master
      route :any, '*path' do
        error!('API V3 is no longer supported. Use API V4 instead.', 410)
      end