Fix more conflicts[ci skip]

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

@@ -29,7 +29,6 @@
         .filter-item.inline.labels-filter
           = render "shared/issuable/label_dropdown", selected: finder.labels.select(:title).uniq, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" }
 
-<<<<<<< HEAD
         - if local_assigns[:type] == :issues
           .filter-item.inline.weight-filter
             - if params[:weight]
@@ -42,8 +41,6 @@
                     %a{href: "#", data: { id: weight }, class: ("is-active" if params[:weight] == weight.to_s)}
                       = weight
 
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
         - if issuable_filter_present?
           .filter-item.inline.reset-filters
             %a{href: page_filter_path(without: issuable_filter_params)} Reset filters

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

@@ -40,11 +40,8 @@
       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')
 
-<<<<<<< HEAD
 = render 'shared/issuable/approvals', issuable: issuable, form: form
 
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
 = render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form
 
 - is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?)

app/views/shared/issuable/form/_metadata.html.haml

@@ -28,14 +28,10 @@
       = form.hidden_field :label_ids, multiple: true, value: ''
       .col-sm-10{ class: "#{"col-lg-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" }
         .issuable-form-select-holder
-<<<<<<< HEAD
           = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false }, dropdown_title: "Select label"
 
     = render "shared/issuable/form/weight", issuable: issuable, form: form
 
-=======
-          = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false}, dropdown_title: "Select label"
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
   - if has_due_date
     .col-lg-6
       .form-group

doc/web_hooks/web_hooks.md

 # Webhooks
 
-<<<<<<< HEAD
-> **Note:** As of GitLab 8.5:
->
-> - the `repository` key is deprecated in favor of the `project` key
-> - the `project.ssh_url` key is deprecated in favor of the `project.git_ssh_url` key
-> - the `project.http_url` key is deprecated in favor of the `project.git_http_url` key
-=======
 >**Note:**
 Starting from GitLab 8.5:
 - the `repository` key is deprecated in favor of the `project` key
@@ -17,7 +10,6 @@ Project webhooks allow you to trigger a URL if for example new code is pushed or
 a new issue is created. You can configure webhooks to listen for specific events
 like pushes, issues or merge requests. GitLab will send a POST request with data
 to the webhook URL.
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
 
 Webhooks can be used to update an external issue tracker, trigger CI builds,
 update a backup mirror, or even deploy to your production server.

features/steps/project/wiki.rb

@@ -80,14 +80,6 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
     expect(page).to have_content "Page was successfully deleted"
   end
 
-<<<<<<< HEAD
-  step 'I click on the "Pages" button' do
-    wiki_menu = find('.content-wrapper .nav-links')
-    wiki_menu.click_on "Pages"
-  end
-
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
   step 'I should see the existing page in the pages list' do
     expect(page).to have_content current_user.name
     expect(find('.wiki-pages')).to have_content @page.title.capitalize