Resolve conflicts in spec/models/project_services/kubernetes_service_spec.rb

spec/models/project_services/kubernetes_service_spec.rb

@@ -412,7 +412,6 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
     context 'if the services is active' do
       it 'should return a message' do
         expect(kubernetes_service.deprecation_message).to match(/Your Kubernetes cluster information on this page is still editable/)
-<<<<<<< HEAD
       end
     end
 
@@ -451,8 +450,6 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
     context 'if the services is active' do
       it 'should return a message' do
         expect(kubernetes_service.deprecation_message).to match(/Your Kubernetes cluster information on this page is still editable/)
-=======
->>>>>>> upstream/master
       end
     end