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 | 4 |
1 files changed, 2 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 8df3170edac..468573a70d3 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, no-extra-semi, padded-blocks */ +/* eslint-disable no-param-reassign, comma-dangle, padded-blocks */ ((global) => { global.mergeConflicts = global.mergeConflicts || {}; @@ -25,7 +25,7 @@ method: 'POST' }); } - }; + } global.mergeConflicts.mergeConflictsService = mergeConflictsService; |