diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-10 18:02:20 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-18 17:16:41 -0600 |
| commit | ccada28f30326262b61638edf77b7ab163ff59a0 (patch) | |
| tree | 0cc73dc1d9d93521ccbcf1830bc51424799cb3fa /app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 | |
| parent | e7b5945c591bcd55911f495635f2f852946bd228 (diff) | |
| download | gitlab-ce-ccada28f30326262b61638edf77b7ab163ff59a0.tar.gz | |
resolve all padded-blocks eslint violations
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 index 74544b7d0c7..240c8f98932 100644 --- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 +++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6 @@ -1,8 +1,7 @@ -/* eslint-disable padded-blocks, no-param-reassign, comma-dangle */ +/* eslint-disable no-param-reassign, comma-dangle */ /* global Vue */ ((global) => { - global.mergeConflicts = global.mergeConflicts || {}; global.mergeConflicts.inlineConflictLines = Vue.extend({ @@ -11,5 +10,4 @@ }, mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions], }); - })(window.gl || (window.gl = {})); |