blob: eb4cc6a9dac9686480f3dd35fe19405d43cd4858 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
((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 = {}));
|