Resolve service_spec.rb

spec/models/service_spec.rb

@@ -276,8 +276,6 @@ describe Service do
       expect(service.deprecation_message).to be_nil
     end
   end
-<<<<<<< HEAD
-=======
 
   describe '.find_by_template' do
     let!(:kubernetes_service) { create(:kubernetes_service, template: true) }
@@ -286,5 +284,4 @@ describe Service do
       expect(KubernetesService.find_by_template).to eq(kubernetes_service)
     end
   end
->>>>>>> upstream/master
 end