Resolve lib/gitlab/auth.rb and lib/gitlab/omniauth_initializer.rb

lib/gitlab/auth.rb

@@ -14,11 +14,8 @@ module Gitlab
     DEFAULT_SCOPES = [:api].freeze
 
     class << self
-<<<<<<< HEAD
       prepend EE::Gitlab::Auth
 
-=======
->>>>>>> upstream/master
       def omniauth_enabled?
         Gitlab.config.omniauth.enabled
       end

lib/gitlab/omniauth_initializer.rb

 module Gitlab
   class OmniauthInitializer
-<<<<<<< HEAD
     prepend ::EE::Gitlab::OmniauthInitializer
 
-=======
->>>>>>> upstream/master
     def initialize(devise_config)
       @devise_config = devise_config
     end