From b2f4a4b5a69663606dbd12b68da8bf79a5b69b79 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Thu, 29 Mar 2018 11:15:04 -0700
Subject: Refs #6156 Fix typo

---
 config/locales/will_paginate.en.yml | 4 ----
 1 file changed, 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
-- 
cgit v1.2.3