diff options
| -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 |