diff options
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6 index 468573a70d3..c012b77e0bf 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6 @@ -1,4 +1,4 @@ -/* eslint-disable no-param-reassign, comma-dangle, padded-blocks */ +/* eslint-disable no-param-reassign, comma-dangle */ ((global) => { global.mergeConflicts = global.mergeConflicts || {}; @@ -28,5 +28,4 @@ } global.mergeConflicts.mergeConflictsService = mergeConflictsService; - })(window.gl || (window.gl = {})); |