summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-03 04:06:25 +0300
committerFatih Acet <acetfatih@gmail.com>2016-11-10 17:53:34 +0300
commit0eb21fd840378d54967fad055cafd1a1a6ecf55d (patch)
tree532066c07ab6a519d3caa99a64f5e7b7bb2fb533 /app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6
parent78c7c11dda5a90e3440e822bed80e7b76bea9065 (diff)
downloadgitlab-ce-0eb21fd840378d54967fad055cafd1a1a6ecf55d.tar.gz
Vue migration fix syntax highlighting.
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6')
0 files changed, 0 insertions, 0 deletions