summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
blob: 56d6678e1bdc20c4f0b796db242b94d8e3764b92 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
/* eslint-disable no-param-reassign, comma-dangle */

import Vue from 'vue';

((global) => {
  global.mergeConflicts = global.mergeConflicts || {};

  global.mergeConflicts.inlineConflictLines = Vue.extend({
    props: {
      file: Object
    },
    mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
  });
})(window.gl || (window.gl = {}));