Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 0 insertions, 12 deletions

diff --git a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
deleted file mode 100644
index 220ddf1bad3..00000000000
--- a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-.file-actions.d-flex.align-items-center.gl-ml-auto.gl-align-self-start
-  .btn-group.gl-mr-3{ "v-if" => "file.type === 'text'" }
-    %button.btn.gl-button{ ":class" => "{ 'active': file.resolveMode == 'interactive' }",
-      '@click' => "onClickResolveModeButton(file, 'interactive')",
-      type: 'button' }
-      = _('Interactive mode')
-    %button.btn.gl-button{ ':class' => "{ 'active': file.resolveMode == 'edit' }",
-      '@click' => "onClickResolveModeButton(file, 'edit')",
-      type: 'button' }
-      = _('Edit inline')
-  %a.btn.gl-button.view-file{ ":href" => "file.blobPath" }
-    = _('View file @%{commit_sha}') % { commit_sha: '{{conflictsData.shortCommitSha}}' }