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

3 files changed, 3 insertions, 11 deletions

diff --git a/VERSION b/VERSION
index cd5aa407ba8..80959b81ba4 100644
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
 10.4.0-pre
-=======
-10.3.4
->>>>>>> Update VERSION to 10.3.4
diff --git a/db/schema.rb b/db/schema.rb
index 25583170851..13913b49902 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20180105212544) do
-=======
-ActiveRecord::Schema.define(version: 20171215121259) do
->>>>>>> Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
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