blob: 8b0a8ab20731215a5f521887d1b6fa6cbb9115de (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
((global) => {
global.mergeConflicts = global.mergeConflicts || {};
global.mergeConflicts.parallelConflictLine = Vue.extend({
props: {
file: Object,
line: Object
},
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
template: '#parallel-conflict-line'
});
})(window.gl || (window.gl = {}));
|