Resolve another conflict in spec/controllers/application_controller_spec.rb

spec/controllers/application_controller_spec.rb

@@ -182,11 +182,7 @@ describe ApplicationController do
 
       context "when the 'feed_token' param is populated with an invalid feed token" do
         it "doesn't log the user" do
-<<<<<<< HEAD
-          get :index, feed_token: "token", format: :atom
-=======
           get :index, feed_token: 'token', format: :atom
->>>>>>> upstream/master
           expect(response.status).not_to eq 200
           expect(response.body).not_to eq 'authenticated'
         end