Fixed conflicts

app/views/layouts/nav/_group_settings.html.haml

@@ -11,7 +11,6 @@
           = icon('cog')
           = icon('caret-down')
         %ul.dropdown-menu.dropdown-menu-align-right
-<<<<<<< HEAD
           = nav_link(path: 'groups#projects') do
             = link_to 'Projects', projects_group_path(@group), title: 'Projects'
           %li.divider
@@ -29,14 +28,6 @@
               = link_to group_audit_events_path(@group), title: "Audit Events" do
                 %span
                   Audit Events
-=======
-          - if can_admin_group
-            = nav_link(path: 'groups#projects') do
-              = link_to 'Projects', projects_group_path(@group), title: 'Projects'
-          - if can_edit || can_leave
-            %li.divider
-          - if can_edit
->>>>>>> fd1741b47970fc52d994367ba38b5d1353d94725
             %li
               = link_to 'Edit Group', edit_group_path(@group)
           - if can_leave

app/views/projects/_issues_settings.html.haml

-%fieldset.features.append-bottom-0.issues-feature
+%fieldset.features.append-bottom-0.issue-feature
   %h5.prepend-top-0
     Issues
   .form-group

app/views/projects/edit.html.haml

@@ -102,12 +102,9 @@
                   %strong Container Registry
                   %br
                   %span.descr Enable Container Registry for this repository
-<<<<<<< ours
         %hr
         = render 'issues_settings', f: f
-=======
-
->>>>>>> theirs
+        %hr
         = render 'merge_request_settings', f: f
         %hr
         %fieldset.features.append-bottom-default

app/views/shared/issuable/_form.html.haml

@@ -142,7 +142,6 @@
       title: 'Moving an issue will copy the discussion to a different project and close it here. All participants will be notified of the new location.' }
         = icon('question-circle')
 
-<<<<<<< ours
 - if issuable.is_a?(MergeRequest)
   - if @merge_request.requires_approve?
     - approvals = issuable.target_project.approvals_before_merge
@@ -191,9 +190,7 @@
             Suggested approvers:
             = raw @suggested_approvers.map{|approver| link_to sanitize(approver.name), "#", id: dom_id(approver) }.join(", ")
 
-=======
 - if issuable.is_a?(MergeRequest) && !issuable.closed_without_fork?
->>>>>>> theirs
   %hr
   - if @merge_request.new_record?
     .form-group