2016-10-26 08:02:58 +00:00
|
|
|
/* eslint-disable */
|
2016-10-05 12:57:22 +00:00
|
|
|
((global) => {
|
|
|
|
|
|
|
|
global.mergeConflicts = global.mergeConflicts || {};
|
|
|
|
|
|
|
|
global.mergeConflicts.parallelConflictLines = Vue.extend({
|
|
|
|
props: {
|
|
|
|
file: Object
|
|
|
|
},
|
2016-11-03 12:53:54 +00:00
|
|
|
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions]
|
2016-10-05 12:57:22 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
})(window.gl || (window.gl = {}));
|