1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
index c9ce76af3d8..c8602003d73 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, object-shorthand, no-dupe-keys, no-param-reassign, camelcase, prefer-const, no-nested-ternary, no-continue, func-call-spacing, no-spaced-func, max-len */
+/* eslint-disable comma-dangle, object-shorthand, no-dupe-keys, no-param-reassign, camelcase, prefer-const, no-nested-ternary, no-continue, max-len */
 /* global Cookies */
 /* global Vue */
 
@@ -121,7 +121,7 @@
           } else {
             const lineType = type || 'context';
 
-            linesObj.left.push (this.getLineForParallelView(line, id, lineType));
+            linesObj.left.push(this.getLineForParallelView(line, id, lineType));
             linesObj.right.push(this.getLineForParallelView(line, id, lineType, true));
           }
         });