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:00 +0300
committerFatih Acet <acetfatih@gmail.com>2016-11-10 17:53:34 +0300
commit78c7c11dda5a90e3440e822bed80e7b76bea9065 (patch)
tree4d144f4cb78989795c658302e2d6401f0f235872 /app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6
parent99b421da2c5b2d889cd1e2ec6a5c60899bfe3593 (diff)
downloadgitlab-ce-78c7c11dda5a90e3440e822bed80e7b76bea9065.tar.gz
VueJS migration, replace {{{ with v-html
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6')
0 files changed, 0 insertions, 0 deletions