Resolve conflicts

app/helpers/diff_helper.rb

@@ -98,11 +98,7 @@ module DiffHelper
     [
       content_tag(:span, link_to(truncate(blob.name, length: 40), tree)),
       '@',
-<<<<<<< HEAD
-      content_tag(:span, commit_id, class: 'monospace')
-=======
       content_tag(:span, commit_id, class: 'commit-sha')
->>>>>>> upstream/master
     ].join(' ').html_safe
   end
 

app/models/blob.rb

@@ -34,15 +34,11 @@ class Blob < SimpleDelegator
 
     BlobViewer::BinarySTL,
     BlobViewer::TextSTL
-<<<<<<< HEAD
-  ].freeze
-=======
   ].sort_by { |v| v.binary? ? 0 : 1 }.freeze
 
   AUXILIARY_VIEWERS = [
     BlobViewer::GitlabCiYml,
     BlobViewer::RouteMap,
->>>>>>> upstream/master
 
     BlobViewer::License,
     BlobViewer::Contributing

app/views/projects/branches/new.html.haml

@@ -20,11 +20,7 @@
     .col-sm-10.create-from
       .dropdown
         = hidden_field_tag :ref, default_ref
-<<<<<<< HEAD
-        = button_tag type: 'button', title: default_ref, class: 'dropdown-menu-toggle wide form-control js-branch-select', required: true, data: { toggle: 'dropdown', selected: default_ref, field_name: 'ref' } do
-=======
         = button_tag type: 'button', title: default_ref, class: 'dropdown-menu-toggle wide form-control js-branch-select git-revision-dropdown-toggle', required: true, data: { toggle: 'dropdown', selected: default_ref, field_name: 'ref' } do
->>>>>>> upstream/master
           .text-left.dropdown-toggle-text= default_ref
           = icon('chevron-down')
         = render 'shared/ref_dropdown', dropdown_class: 'wide'

features/project/project.feature

@@ -19,14 +19,12 @@ Feature: Project
     And I should not see the "Remove avatar" button
 
   @javascript
-<<<<<<< HEAD
   Scenario: I enable issues
     Given I visit edit project "Shop" page
     When I enable project issues
     Then I should see the issues settings
 
-=======
->>>>>>> upstream/master
+  @javascript
   Scenario: I should have readme on page
     And I visit project "Shop" page
     Then I should see project "Shop" README

features/steps/project/project.rb

@@ -2,11 +2,8 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedPaths
-<<<<<<< HEAD
   include Select2Helper
-=======
   include WaitForAjax
->>>>>>> upstream/master
 
   step 'change project settings' do
     fill_in 'project_name_edit', with: 'NewName'

spec/policies/project_snippet_policy_spec.rb

@@ -142,7 +142,6 @@ describe ProjectSnippetPolicy, models: true do
       subject { abilities(external_user, :private) }
 
       before { project.team << [external_user, :developer] }
-<<<<<<< HEAD
 
       it do
         is_expected.to include(:read_project_snippet)
@@ -153,8 +152,6 @@ describe ProjectSnippetPolicy, models: true do
     context 'auditor user' do
       let(:current_user) { create(:user, :auditor) }
       subject { abilities(current_user, :private) }
-=======
->>>>>>> upstream/master
 
       it do
         is_expected.to include(:read_project_snippet)