Resolve lib/api/helpers.rb

7edaf026 · Lin Jen-Shin · 819cf890 · 7edaf026
Commit 7edaf026 authored Dec 16, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -434,7 +434,6 @@ module API
    private
-<<<<<<< HEAD
    def private_token
      params[APIGuard::PRIVATE_TOKEN_PARAM] || env[APIGuard::PRIVATE_TOKEN_HEADER]
    end
@@ -457,9 +456,7 @@ module API
      warden.try(:authenticate) if verified_request?
    end
-=======
    # rubocop:disable Gitlab/ModuleWithInstanceVariables
->>>>>>> upstream/master
    def initial_current_user
      return @initial_current_user if defined?(@initial_current_user) # rubocop:disable Gitlab/ModuleWithInstanceVariables