1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
index 83520702f9b..a2d90f9ba47 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable new-cap, comma-dangle, no-new, semi */
+/* eslint-disable new-cap, comma-dangle, no-new */
 /* global Vue */
 /* global Flash */
 
@@ -29,10 +29,10 @@ $(() => {
       'parallel-conflict-lines': gl.mergeConflicts.parallelConflictLines
     },
     computed: {
-      conflictsCountText() { return mergeConflictsStore.getConflictsCountText() },
-      readyToCommit() { return mergeConflictsStore.isReadyToCommit() },
-      commitButtonText() { return mergeConflictsStore.getCommitButtonText() },
-      showDiffViewTypeSwitcher() { return mergeConflictsStore.fileTextTypePresent() }
+      conflictsCountText() { return mergeConflictsStore.getConflictsCountText(); },
+      readyToCommit() { return mergeConflictsStore.isReadyToCommit(); },
+      commitButtonText() { return mergeConflictsStore.getCommitButtonText(); },
+      showDiffViewTypeSwitcher() { return mergeConflictsStore.fileTextTypePresent(); }
     },
     created() {
       mergeConflictsService
@@ -88,5 +88,5 @@ $(() => {
           });
       }
     }
-  })
+  });
 });