diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-27 18:00:30 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-27 18:00:30 +0300 |
| commit | 76704c7960a880106a7ce5706cb5f3915defb8de (patch) | |
| tree | 167b92aa4db60ee47e0d3dd3133fc8656c4594d5 /app/assets/javascripts/merge_conflicts | |
| parent | 425dbdd222244bc00cab8c2dbd6bb94233d11a15 (diff) | |
| parent | 842bcfa77700459fcd426fb11a4058d8aa103469 (diff) | |
Merge branch 'master' into ph-inline-js
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js index c4e379a4a0b..8be7314ded8 100644 --- 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}`; }, |