blob: b4be1c8988d0c6ce37548ede8d2329ed9092cc99 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
|
((global) => {
global.mergeConflicts = global.mergeConflicts || {};
global.mergeConflicts.inlineConflictLines = Vue.extend({
props: {
file: Object
},
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
});
})(window.gl || (window.gl = {}));
|