2017-01-10 23:02:20 +00:00
|
|
|
/* eslint-disable no-param-reassign, comma-dangle */
|
2017-03-17 17:21:25 +00:00
|
|
|
|
|
|
|
import Vue from 'vue';
|
2016-12-14 03:01:05 +00:00
|
|
|
|
2016-10-05 12:57:22 +00:00
|
|
|
((global) => {
|
|
|
|
global.mergeConflicts = global.mergeConflicts || {};
|
|
|
|
|
|
|
|
global.mergeConflicts.inlineConflictLines = Vue.extend({
|
|
|
|
props: {
|
|
|
|
file: Object
|
|
|
|
},
|
|
|
|
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
|
|
|
|
});
|
|
|
|
})(window.gl || (window.gl = {}));
|