Resolve conflicts in VERSION, db/schema.rb, and spec/models/service_spec.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 15c1e57c9e4..79f25dc4360 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -255,7 +255,6 @@ describe Service do
     end
   end
 
-<<<<<<< HEAD
   describe "#deprecated?" do
     let(:project) { create(:project, :repository) }
 
@@ -279,7 +278,9 @@ describe Service do
 
     it 'returns service template' do
       expect(KubernetesService.find_by_template).to eq(kubernetes_service)
-=======
+    end
+  end
+
   describe '#api_field_names' do
     let(:fake_service) do
       Class.new(Service) do
@@ -311,7 +312,6 @@ describe Service do
 
     it 'filters out sensitive fields' do
       expect(service.api_field_names).to eq(['safe_field'])
->>>>>>> Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3'
     end
   end
 end