adding pending spec to check for error within webfinger process

spec/controllers/requests_controller_spec.rb

@@ -53,11 +53,8 @@ describe RequestsController do
   it 'should redirect to the page which you called it from ' do
     pending "i need to figure out how to do this"
   end
-<<<<<<< HEAD
 
   it 'should not blow up if there is a problem mid way thru the webfinger process' do
-    pending "i need to do this tomorrow
+    pending "i need to do this tomorrow'
   end
-=======
->>>>>>> EM websocket cleanly merged with master.  webfingering is now async
 end