solve conflict in app/views/projects/blob/_header.html.haml

solve conflict in app/views/projects/tree/_tree_header.html.haml

app/views/projects/blob/_header.html.haml

@@ -14,12 +14,11 @@
       = lock_file_link(html_options: { class: 'btn btn-sm path-lock' })
 
       = edit_blob_button
-<<<<<<< HEAD
+
       -# EE-specific
       = ide_edit_button
       -# EE-specific
-=======
->>>>>>> upstream/master
+
       - if current_user
         = replace_blob_link
         = delete_blob_link

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

@@ -72,11 +72,8 @@
                   #{ _('New tag') }
 
 .tree-controls
-<<<<<<< HEAD
 
   = lock_file_link(html_options: { class: 'btn path-lock' })
-=======
->>>>>>> upstream/master
   = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn'
 
   = render 'projects/find_file_link'