Resolve spec/controllers/oauth/applications_controller_spec.rb

spec/controllers/oauth/applications_controller_spec.rb

@@ -15,11 +15,7 @@ describe Oauth::ApplicationsController do
         expect(response).to have_gitlab_http_status(200)
       end
 
-<<<<<<< HEAD
       it 'redirects back to profile page if OAuth applications are disabled' do
-=======
-      it 'shows list of applications' do
->>>>>>> upstream/master
         disable_user_oauth
 
         get :index