Resolve ce-ee conflict

lib/gitlab/access.rb

@@ -17,10 +17,7 @@ module Gitlab
     # @deprecated
     MASTER     = MAINTAINER
     OWNER      = 50
-<<<<<<< HEAD
     ADMIN      = 60
-=======
->>>>>>> upstream/master
 
     # Branch protection settings
     PROTECTION_NONE          = 0

spec/features/boards/sidebar_spec.rb

@@ -22,10 +22,7 @@ describe 'Issue Boards', :js do
   end
 
   before do
-<<<<<<< HEAD
     stub_licensed_features(multiple_issue_assignees: false)
-=======
->>>>>>> upstream/master
     project.add_maintainer(user)
 
     sign_in(user)

spec/features/issues/form_spec.rb

@@ -13,11 +13,8 @@ describe 'New/edit issue', :js do
   let!(:issue)     { create(:issue, project: project, assignees: [user], milestone: milestone) }
 
   before do
-<<<<<<< HEAD
     stub_licensed_features(multiple_issue_assignees: false, issue_weights: false)
 
-=======
->>>>>>> upstream/master
     project.add_maintainer(user)
     project.add_maintainer(user2)
     sign_in(user)

spec/features/projects/merge_requests/user_creates_merge_request_spec.rb

@@ -17,10 +17,7 @@ describe "User creates a merge request", :js do
 
   before do
     project.add_maintainer(user)
-<<<<<<< HEAD
     project.add_maintainer(approver)
-=======
->>>>>>> upstream/master
     sign_in(user)
 
     project.approvers.create(user_id: approver.id)

spec/javascripts/fixtures/projects.rb

@@ -17,12 +17,9 @@ describe 'Projects (JavaScript fixtures)', type: :controller do
   end
 
   before do
-<<<<<<< HEAD
     # EE-specific start
     stub_licensed_features(variable_environment_scope: true)
     # EE specific end
-=======
->>>>>>> upstream/master
     project.add_maintainer(admin)
     sign_in(admin)
   end

spec/requests/api/protected_branches_spec.rb

@@ -56,10 +56,7 @@ describe API::ProtectedBranches do
         expect(json_response['name']).to eq(branch_name)
         expect(json_response['push_access_levels'][0]['access_level']).to eq(::Gitlab::Access::MAINTAINER)
         expect(json_response['merge_access_levels'][0]['access_level']).to eq(::Gitlab::Access::MAINTAINER)
-<<<<<<< HEAD
         expect(json_response['unprotect_access_levels']).to eq([])
-=======
->>>>>>> upstream/master
       end
 
       context 'when protected branch does not exist' do
@@ -149,10 +146,7 @@ describe API::ProtectedBranches do
         expect(json_response['name']).to eq(branch_name)
         expect(json_response['push_access_levels'][0]['access_level']).to eq(Gitlab::Access::MAINTAINER)
         expect(json_response['merge_access_levels'][0]['access_level']).to eq(Gitlab::Access::MAINTAINER)
-<<<<<<< HEAD
         expect(json_response['unprotect_access_levels'][0]['access_level']).to eq(Gitlab::Access::MAINTAINER)
-=======
->>>>>>> upstream/master
       end
 
       it 'protects a single branch and developers can push' do