diff options
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js.es6')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js.es6 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js.es6 b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js.es6 index b846a90ab2a..88c3a20ce13 100644 --- a/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js.es6 +++ b/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js.es6 @@ -1,3 +1,4 @@ +/* eslint-disable */ ((global) => { global.mergeConflicts = global.mergeConflicts || {}; |