From e7b5945c591bcd55911f495635f2f852946bd228 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Tue, 10 Jan 2017 17:54:56 -0500
Subject: resolve all semi and no-extra-semi eslint violations

---
 .../javascripts/merge_conflicts/components/diff_file_editor.js.es6    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6')

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() {
-- 
cgit v1.2.3