diff options
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6 | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6 b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6 new file mode 100644 index 00000000000..1b3e9901f1e --- /dev/null +++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6 @@ -0,0 +1,16 @@ +/* eslint-disable */ +((global) => { + + global.mergeConflicts = global.mergeConflicts || {}; + + global.mergeConflicts.parallelConflictLines = Vue.extend({ + props: { + file: Object + }, + mixins: [global.mergeConflicts.utils], + components: { + 'parallel-conflict-line': gl.mergeConflicts.parallelConflictLine + } + }); + +})(window.gl || (window.gl = {})); |