CE->EE: resolve merge conflicts

Gemfile.lock

@@ -315,12 +315,8 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-<<<<<<< HEAD
     gitlab-license (1.0.0)
-    gitlab-markup (1.6.2)
-=======
     gitlab-markup (1.6.3)
->>>>>>> ce/master
     gitlab_omniauth-ldap (2.0.4)
       net-ldap (~> 0.16)
       omniauth (~> 1.3)

app/assets/javascripts/init_issuable_sidebar.js

 /* eslint-disable no-new */
 /* global MilestoneSelect */
-<<<<<<< HEAD
 /* global WeightSelect */
-=======
->>>>>>> ce/master
 import LabelsSelect from './labels_select';
 import IssuableContext from './issuable_context';
 /* global Sidebar */

app/views/projects/edit.html.haml

@@ -81,11 +81,8 @@
         .js-project-permissions-form
         = f.submit 'Save changes', class: "btn btn-save"
 
-<<<<<<< HEAD
   = render 'projects/ee/issues_settings'
 
-=======
->>>>>>> ce/master
   %section.settings.merge-requests-feature.no-animate{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] }
     .settings-header
       %h4
@@ -95,11 +92,8 @@
       %p
         Customize your merge request restrictions.
     .settings-content
-<<<<<<< HEAD
       = render 'shared/promotions/promote_mr_features'
 
-=======
->>>>>>> ce/master
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form" }, authenticity_token: true do |f|
         = render 'projects/ee/merge_request_settings', form: f
         = f.submit 'Save changes', class: "btn btn-save"