2017-01-10 23:02:20 +00:00
|
|
|
/* eslint-disable no-param-reassign, comma-dangle */
|
2016-12-14 03:01:05 +00:00
|
|
|
|
2016-10-05 12:57:22 +00:00
|
|
|
((global) => {
|
|
|
|
global.mergeConflicts = global.mergeConflicts || {};
|
|
|
|
|
|
|
|
global.mergeConflicts.actions = {
|
|
|
|
methods: {
|
|
|
|
handleSelected(file, sectionId, selection) {
|
|
|
|
gl.mergeConflicts.mergeConflictsStore.handleSelected(file, sectionId, selection);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
})(window.gl || (window.gl = {}));
|