summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6
blob: 23c4618af7048852a8a83ef39634d445ba8bae1d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
/* eslint-disable */
((global) => {

  global.mergeConflicts = global.mergeConflicts || {};

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

})(window.gl || (window.gl = {}));