fix conflict pluralized

a8b33d7b · Emilien Mottet · c2c8d7ff · a8b33d7b
Commit a8b33d7b authored Jul 24, 2017 by Emilien Mottet
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/javascripts/merge_conflicts/merge_conflict_store.js ...ssets/javascripts/merge_conflicts/merge_conflict_store.js +1 -1

No files found.
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js
@@ -175,7 +175,7 @@ import Cookies from 'js-cookie';
    getConflictsCountText() {
      const count = this.getConflictsCount();
-      const text = count ? 'conflicts' : 'conflict';
+      const text = count > 1 ? 'conflicts' : 'conflict';
      return `${count} ${text}`;
    },