Resolve conflict in spec/requests/api/services_spec.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/requests/api/services_spec.rb

@@ -176,22 +176,6 @@ describe API::Services do
     end
   end
 
-<<<<<<< HEAD
-  describe 'Slack application Service' do
-    before do
-      project.create_gitlab_slack_application_service
-
-      stub_application_setting(
-        slack_app_verification_token: 'token'
-      )
-    end
-
-    it 'returns status 200' do
-      post api('/slack/trigger'), token: 'token', text: 'help'
-
-      expect(response).to have_gitlab_http_status(200)
-      expect(json_response['response_type']).to eq("ephemeral")
-=======
   describe 'Mattermost service' do
     let(:service_name) { 'mattermost' }
     let(:params) do
@@ -210,7 +194,23 @@ describe API::Services do
 
       expect(response).to have_gitlab_http_status(200)
       expect(json_response['properties']['username']).to eq('new_username')
->>>>>>> ce-com/master
+    end
+  end
+
+  describe 'Slack application Service' do
+    before do
+      project.create_gitlab_slack_application_service
+
+      stub_application_setting(
+        slack_app_verification_token: 'token'
+      )
+    end
+
+    it 'returns status 200' do
+      post api('/slack/trigger'), token: 'token', text: 'help'
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(json_response['response_type']).to eq("ephemeral")
     end
   end
 end