gitlab-org--gitlab-foss/app/assets/javascripts/merge_conflicts/components
2018-02-02 14:22:13 -06:00
..
diff_file_editor.js Replace $.get in diff file editor with axios 2018-02-02 14:22:13 -06:00
inline_conflict_lines.js remove Vue from the global space 2017-03-20 22:12:01 -05:00
parallel_conflict_lines.js remove Vue from the global space 2017-03-20 22:12:01 -05:00