Resolve conflicts caused by `show_new_ide?`

app/helpers/blob_helper.rb

@@ -34,11 +34,7 @@ module BlobHelper
   end
 
   def ide_edit_button(project = @project, ref = @ref, path = @path, options = {})
-<<<<<<< HEAD
     return unless show_new_ide?(project)
-=======
-    return unless show_new_ide?
->>>>>>> upstream/master
     return unless blob = readable_blob(options, path, project, ref)
 
     common_classes = "btn js-edit-ide #{options[:extra_class]}"

app/views/projects/tree/_tree_header.html.haml

@@ -72,15 +72,8 @@
                   #{ _('New tag') }
 
 .tree-controls
-<<<<<<< HEAD
-  = lock_file_link(html_options: { class: 'btn path-lock' })
-=======
-  - if show_new_ide?
-    = succeed " " do
-      = link_to ide_edit_path(@project, @id), class: 'btn btn-default' do
-        = _('Web IDE')
 
->>>>>>> upstream/master
+  = lock_file_link(html_options: { class: 'btn path-lock' })
   = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn'
 
   = render 'projects/find_file_link'