Fix conflicts in specs

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

spec/javascripts/project_title_spec.js

@@ -26,11 +26,7 @@ require('~/project');
       var fakeAjaxResponse = function fakeAjaxResponse(req) {
         var d;
         expect(req.url).toBe('/api/v3/projects.json?simple=true');
-<<<<<<< HEAD
-        expect(req.data).toEqual({ search: '', order_by: 'last_activity_at', membership: true, per_page: 20 });
-=======
         expect(req.data).toEqual({ search: '', order_by: 'last_activity_at', per_page: 20, membership: true });
->>>>>>> ce/master
         d = $.Deferred();
         d.resolve(this.projects_data);
         return d.promise();

spec/models/user_spec.rb

@@ -211,7 +211,6 @@ describe User, models: true do
         end
       end
     end
-<<<<<<< HEAD
 
     it 'does not allow a user to be both an auditor and an admin' do
       user = build(:user, :admin, :auditor)
@@ -234,8 +233,6 @@ describe User, models: true do
         expect(user).to be_valid
       end
     end
-=======
->>>>>>> ce/master
   end
 
   describe "non_ldap" do

spec/spec_helper.rb

@@ -43,11 +43,8 @@ RSpec.configure do |config|
   config.include ActiveSupport::Testing::TimeHelpers
   config.include StubGitlabCalls
   config.include StubGitlabData
-<<<<<<< HEAD
-  config.include Rails.application.routes.url_helpers, type: :routing
-=======
   config.include ApiHelpers, :api
->>>>>>> ce/master
+  config.include Rails.application.routes.url_helpers, type: :routing
 
   config.infer_spec_type_from_file_location!
 
@@ -61,17 +58,16 @@ RSpec.configure do |config|
     TestEnv.init
   end
 
-<<<<<<< HEAD
   config.before(:all) do
     License.destroy_all
     TestLicense.init
-=======
+  end
+
   if ENV['CI']
     # Retry only on feature specs that use JS
     config.around :each, :js do |ex|
       ex.run_with_retry retry: 3
     end
->>>>>>> ce/master
   end
 
   config.around(:each, :caching) do |example|