1 files changed, 0 insertions, 13 deletions
diff --git a/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml b/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml
deleted file mode 100644
index 0fd7095683c..00000000000
--- a/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-%parallel-conflict-lines{"inline-template" => "true", ":file" => "file"}
-  %table
-    %tr.line_holder.parallel{"v-for" => "section in file.parallelLines"}
-      %template{"is"=>"parallel-conflict-line", "v-for" => "line in section", ":line" => "line", ":file" => "file"}
-        %td.diff-line-num.header{":class" => "lineCssClass(line)", "v-if" => "line.isHeader"}
-        %td.line_content.header{":class" => "lineCssClass(line)", "v-if" => "line.isHeader"}
-          %strong {{line.richText}}
-          %button.btn{"@click" => "handleSelected(file, line.id, line.section)"}
-            {{line.buttonTitle}}
-        %td.diff-line-num.old_line{":class" => "lineCssClass(line)", "v-if" => "!line.isHeader"}
-          {{line.lineNumber}}
-        %td.line_content.parallel{":class" => "lineCssClass(line)", "v-if" => "!line.isHeader", "v-html" => "line.richText"}
-