CE->EE: Fix conflicts in spec/services/wiki_pages/update_service_spec.rb

spec/services/wiki_pages/update_service_spec.rb

@@ -25,14 +25,9 @@ describe WikiPages::UpdateService do
       updated_page = service.execute(page)
 
       expect(updated_page).to be_valid
-<<<<<<< HEAD
       expect(updated_page).to have_attributes(message: opts[:message], content: opts[:content], format: opts[:format].to_sym)
-=======
-      expect(updated_page.message).to eq(opts[:message])
-      expect(updated_page.content).to eq(opts[:content])
-      expect(updated_page.format).to eq(opts[:format].to_sym)
+
       expect(updated_page.title).to eq(opts[:title])
->>>>>>> upstream/master
     end
 
     it 'executes webhooks' do