1 files changed, 4 insertions, 6 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..c7e78fed8fe 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,10 +1,9 @@
-/* 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, no-new, no-param-reassign, max-len */
 /* global Vue */
 /* global ace */
 /* global Flash */
 
 ((global) => {
-
   global.mergeConflicts = global.mergeConflicts || {};
 
   global.mergeConflicts.diffFileEditor = Vue.extend({
@@ -19,7 +18,7 @@
         loading: false,
         fileLoaded: false,
         originalContent: '',
-      }
+      };
     },
     computed: {
       classObject() {
@@ -51,8 +50,8 @@
 
         $.get(this.file.content_path)
           .done((file) => {
-            let content = this.$el.querySelector('pre');
-            let fileContent = document.createTextNode(file.content);
+            const content = this.$el.querySelector('pre');
+            const fileContent = document.createTextNode(file.content);
 
             content.textContent = fileContent.textContent;
 
@@ -94,5 +93,4 @@
       }
     }
   });
-
 })(window.gl || (window.gl = {}));