gitlab-org--gitlab-foss/app/views/projects/merge_requests/conflicts
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
..
components VueJSMigration: Remove parallel-conflict-line component. 2016-11-10 17:53:34 +03:00
_commit_stats.html.haml Improve components for PhantomJs compatibility 2016-10-13 14:16:35 -05:00
_file_actions.html.haml Ability to resolve conflicts for files with text-editor as conflict type 2016-10-13 14:16:35 -05:00
_submit_form.html.haml Refactor JS code 2016-10-13 14:16:35 -05:00