Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-01-11 01:54:56 +0300
committerMike Greiling <mike@pixelcog.com>2017-01-19 02:15:27 +0300
commite7b5945c591bcd55911f495635f2f852946bd228 (patch)
treefe9aab0029921dafd1f5a4f136256bae3f702f0f /app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
parent9e4d04913ab9267d4a59df4d7feafd97b8117fe7 (diff)
resolve all semi and no-extra-semi eslint violations
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6')
-rw-r--r--app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es64
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
index f95b079c972..671816c5aa4 100644
--- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
+++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, quote-props, no-useless-computed-key, object-shorthand, prefer-const, no-new, padded-blocks, no-param-reassign, semi, max-len */
+/* eslint-disable comma-dangle, quote-props, no-useless-computed-key, object-shorthand, prefer-const, no-new, padded-blocks, no-param-reassign, max-len */
/* global Vue */
/* global ace */
/* global Flash */
@@ -19,7 +19,7 @@
loading: false,
fileLoaded: false,
originalContent: '',
- }
+ };
},
computed: {
classObject() {