Update users.rb

b827e126 · Francisco Javier López · aac0559d · b827e126
Commit b827e126 authored Jun 13, 2018 by Francisco Javier López
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

lib/api/users.rb lib/api/users.rb +0 -4

No files found.
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -537,11 +537,7 @@ module API
        authenticate!
      end
-<<<<<<< HEAD
-      # Enabling /users/:id endpoint for the v3 version to allow oauth
-=======
      # Enabling /user endpoint for the v3 version to allow oauth
->>>>>>> upstream/master
      # authentication through this endpoint.
      version %w(v3 v4), using: :path do
        desc 'Get the currently authenticated user' do