summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/components
ModeNameSize
-rw-r--r--_diff_file_editor.html.haml796logplain
-rw-r--r--_inline_conflict_lines.html.haml1016logplain