From 3fb779283d852c147470c0feb853376f9b3a6a19 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Sun, 25 Oct 2015 22:34:42 +0100
Subject: [PATCH] Bug 14915: (QA followup) Replace fa-merge with fa-compress

Another icon that doesn't quite exist in Font Awesome -
this is starting to get a bit troublesome.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index b2131a415b..35f35e9805 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -92,7 +92,7 @@
             </ul>
         </div>
     [% IF ( total ) %]
-        <div class="btn-group"><button type="submit" class="btn btn-small merge-items"><i class="fa fa-merge"></i> Merge selected</button></div>
+        <div class="btn-group"><button type="submit" class="btn btn-small merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>
     [% END %]
   </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index 14cf153f52..169bc28761 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -381,7 +381,7 @@ function placeHold () {
         [% IF ( allowremovingitems ) %]
             <div class="btn-group"><button type="submit" class="btn btn-mini list-remove"><i class="fa fa-times-circle"></i> Remove selected</button></div>
         [% END %]
-        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-mini merge-items"><i class="fa fa-merge"></i> Merge selected</button></div>[% END %]
+        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-mini merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>[% END %]
         </div>
     [% END %]
 </div>
-- 
2.39.5