gitlab-org--gitlab-foss/app/views/projects/merge_requests/conflicts/components
Fatih Acet a1fc04dfad VueJSMigration: Remove parallel-conflict-line component.
It's because Vue says: "Component template should contain exactly one root element".
2016-11-10 17:53:34 +03:00
..
_diff_file_editor.html.haml Fix discard message 2016-10-13 14:16:35 -05:00
_inline_conflict_lines.html.haml VueJS migration, replace {{{ with v-html 2016-11-10 17:53:34 +03:00
_parallel_conflict_line.html.haml VueJS migration, replace {{{ with v-html 2016-11-10 17:53:34 +03:00
_parallel_conflict_lines.html.haml VueJSMigration: Remove parallel-conflict-line component. 2016-11-10 17:53:34 +03:00