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

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

@@ -11,11 +11,8 @@
       = view_on_environment_button(@commit.sha, @path, @environment) if @environment
 
     .btn-group{ role: "group" }<
-<<<<<<< HEAD
       = lock_file_link(html_options: { class: 'btn btn-sm path-lock' })
 
-=======
->>>>>>> upstream/master
       = edit_blob_button
       = ide_edit_button
       - if current_user