diff options
| author | cedricnjanga | 2018-03-29 11:15:04 -0700 |
|---|---|---|
| committer | cedricnjanga | 2018-03-29 11:15:04 -0700 |
| commit | b2f4a4b5a69663606dbd12b68da8bf79a5b69b79 (patch) | |
| tree | 483c5b649e0555ca9351b8d42bde5d087d0a0896 /config | |
| parent | 9af9d272090c1086422fbb6d3af928c35166f619 (diff) | |
| download | chouette-core-b2f4a4b5a69663606dbd12b68da8bf79a5b69b79.tar.bz2 | |
Refs #6156 Fix typo6156-journey_pattern-translations
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/will_paginate.en.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/locales/will_paginate.en.yml b/config/locales/will_paginate.en.yml index e3b6769ba..8f3189675 100644 --- a/config/locales/will_paginate.en.yml +++ b/config/locales/will_paginate.en.yml @@ -39,8 +39,4 @@ en: other: "%{model} 1 to %{count} out of %{count}" multi_page: "%{model} list %{from} to %{to} out of %{count}" -<<<<<<< Updated upstream multi_page_html: "%{model} list %{from} to %{to} out of %{count}" -======= - multi_page_html: "%{model} list %{from} to %{to} out of %{count}" ->>>>>>> Stashed changes |