Resolve conflicts

app/helpers/projects_helper.rb

@@ -485,15 +485,9 @@ module ProjectsHelper
 
   def project_feature_options
     {
-<<<<<<< HEAD
-      s_('ProjectFeature|Disabled') => ProjectFeature::DISABLED,
-      s_('ProjectFeature|Only team members') => ProjectFeature::PRIVATE,
-      s_('ProjectFeature|Everyone with access') => ProjectFeature::ENABLED
-=======
       ProjectFeature::DISABLED => s_('ProjectFeature|Disabled'),
       ProjectFeature::PRIVATE => s_('ProjectFeature|Only team members'),
       ProjectFeature::ENABLED => s_('ProjectFeature|Everyone with access')
->>>>>>> ce-com/master
     }
   end
 

spec/features/projects/blobs/blob_show_spec.rb

@@ -105,13 +105,7 @@ feature 'File blob', :js, feature: true do
 
     context 'visiting with a line number anchor' do
       before do
-<<<<<<< HEAD
-        visit_blob('files/markdown/ruby-style-guide.md', 'L1')
-
-        wait_for_requests
-=======
         visit_blob('files/markdown/ruby-style-guide.md', anchor: 'L1')
->>>>>>> ce-com/master
       end
 
       it 'displays the blob using the simple viewer' do