REsolve conflicts

Gemfile

@@ -34,12 +34,8 @@ gem 'omniauth-saml',          '~> 1.7.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd',         '~> 2.2.0'
-<<<<<<< HEAD
 gem 'gssapi', group: :kerberos
-gem 'omniauth-authentiq',     '~> 0.2.0'
-=======
 gem 'omniauth-authentiq',     '~> 0.3.0'
->>>>>>> b596dd8fedd9dc8f9487e1e67a52a7b211bd956b
 gem 'rack-oauth2',            '~> 1.2.1'
 gem 'jwt',                    '~> 1.5.6'
 

app/controllers/omniauth_callbacks_controller.rb

@@ -78,7 +78,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     handle_omniauth
   end
 
-<<<<<<< HEAD
   def kerberos_spnego
     # The internal kerberos_spnego provider is a replacement for
     # omniauth-kerberos. Here we re-use the 'kerberos' provider name to ease
@@ -86,12 +85,14 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     # omniauth-kerberos gem and rename the internal 'kerberos_spnego'
     # provider to plain 'kerberos' and remove this special method.
     oauth['provider'] = 'kerberos'
-=======
+    handle_omniauth
+  end
+
   def authentiq
     if params['sid']
       handle_service_ticket oauth['provider'], params['sid']
     end
->>>>>>> b596dd8fedd9dc8f9487e1e67a52a7b211bd956b
+
     handle_omniauth
   end
 

doc/api/projects.md

@@ -1202,7 +1202,7 @@ Parameters:
 | `query` | string | yes | A string contained in the project name |
 | `order_by` | string | no | Return requests ordered by `id`, `name`, `created_at` or `last_activity_at` fields |
 | `sort` | string | no | Return requests sorted in `asc` or `desc` order |
-<<<<<<< HEAD
+
 
 ## Push Rules (EE only)
 
@@ -1291,5 +1291,3 @@ Parameters:
 
 Note the JSON response differs if the push rule is available or not. If the project push rule
 is available before it is returned in the JSON response or an empty response is returned.
-=======
->>>>>>> b596dd8fedd9dc8f9487e1e67a52a7b211bd956b

package.json

@@ -20,7 +20,7 @@
     "d3": "^3.5.11",
     "dropzone": "^4.2.0",
     "es6-promise": "^4.0.5",
-    "jquery": "2.2.1",
+    "jquery": "^2.2.1",
     "jquery-ui": "git+https://github.com/jquery/jquery-ui#1.11.4",
     "jquery-ujs": "^1.2.1",
     "js-cookie": "^2.1.3",