summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
diff options
context:
space:
mode:
authorLukas Eipert <leipert@gitlab.com>2018-06-16 15:20:30 +0200
committerLukas Eipert <leipert@gitlab.com>2018-06-20 14:28:28 +0200
commit0e6441164f74a76b4b3decd3c0b0d8d31e15c815 (patch)
treedfd2fcf27f0f0a1016dad23dcc796cb3440f9cc5 /app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
parenta0a05a05f7d4353753852374f0a16a18c62ae843 (diff)
downloadgitlab-ce-0e6441164f74a76b4b3decd3c0b0d8d31e15c815.tar.gz
remove all unused eslint-disable rules
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/diff_file_editor.js')
-rw-r--r--app/assets/javascripts/merge_conflicts/components/diff_file_editor.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
index e4ed8111824..81950515ab4 100644
--- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
+++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, quote-props, no-useless-computed-key, object-shorthand, no-new, no-param-reassign, max-len */
+/* eslint-disable comma-dangle, quote-props, no-useless-computed-key, object-shorthand, no-param-reassign, max-len */
/* global ace */
import Vue from 'vue';