diff options
| -rw-r--r-- | config/locales/will_paginate.en.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/will_paginate.en.yml b/config/locales/will_paginate.en.yml index 563ea7d29..e3b6769ba 100644 --- a/config/locales/will_paginate.en.yml +++ b/config/locales/will_paginate.en.yml @@ -39,4 +39,8 @@ en: other: "%{model} 1 to %{count} out of %{count}" multi_page: "%{model} list %{from} to %{to} out of %{count}" - multi_page_html: "%{model} list %{from} to %{to} out of %{count}"
\ No newline at end of file +<<<<<<< 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 |