resolved haml conflicts

[ci skip]

app/assets/javascripts/dispatcher.js

@@ -659,10 +659,7 @@ import initGroupAnalytics from './init_group_analytics';
             case 'edit':
               shortcut_handler = new ShortcutsNavigation();
               new ProjectNew();
-<<<<<<< HEAD
               new ApproversSelect();
-=======
->>>>>>> upstream/master
               import(/* webpackChunkName: 'project_permissions' */ './projects/permissions')
                 .then(permissions => permissions.default())
                 .catch(() => {});

app/views/groups/edit.html.haml

@@ -30,7 +30,6 @@
         .col-sm-offset-2.col-sm-10
           = render 'shared/allow_request_access', form: f
 
-<<<<<<< HEAD
       .form-group
         %label.control-label
           = s_("GroupSettings|Share with group lock")
@@ -54,22 +53,6 @@
           .checkbox
             = f.check_box :membership_lock
             %span.descr Prevent adding new members to project membership within this group
-=======
-      .form-group
-        %label.control-label
-          = s_("GroupSettings|Share with group lock")
-        .col-sm-10
-          .checkbox
-            = f.label :share_with_group_lock do
-              = f.check_box :share_with_group_lock, disabled: !can_change_share_with_group_lock?(@group)
-              %strong
-                - group_link = link_to @group.name, group_path(@group)
-                = s_("GroupSettings|Prevent sharing a project within %{group} with other groups").html_safe % { group: group_link }
-              %br
-              %span.descr= share_with_group_lock_help_text(@group)
-
-      = render 'group_admin_settings', f: f
->>>>>>> upstream/master
 
       .form-actions
         = f.submit 'Save group', class: "btn btn-save"

app/views/groups/issues.html.haml

@@ -7,10 +7,7 @@
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
   = webpack_bundle_tag 'filtered_search'
-<<<<<<< HEAD
   = webpack_bundle_tag 'issues'
-=======
->>>>>>> upstream/master
 
 - if group_issues_exists
   .top-area

app/views/projects/edit.html.haml

@@ -83,11 +83,8 @@
         .js-project-permissions-form
         = f.submit 'Save changes', class: "btn btn-save"
 
-<<<<<<< HEAD
   = render 'projects/ee/issues_settings'
 
-=======
->>>>>>> upstream/master
   %section.settings.merge-requests-feature{ class: ("hidden" if @project.project_feature.send(:merge_requests_access_level) == 0) }
     .settings-header
       %h4