From d712684bfc36c9f40e69b3c3321ab46a65ddb1aa Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 7 Jul 2022 10:32:19 -0300 Subject: [PATCH] Bug 24857: Fix rebase problems Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 1 + t/db_dependent/Koha/Item.t | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 4c8ba311bd..7be66d834f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1824,6 +1824,7 @@ Note that permanent location is a code, and location may be an authval. $('#modal-item-group-unset').modal('hide'); }); [% END %] + [% END %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/t/db_dependent/Koha/Item.t b/t/db_dependent/Koha/Item.t index e3d14f97de..a61be9baa0 100755 --- a/t/db_dependent/Koha/Item.t +++ b/t/db_dependent/Koha/Item.t @@ -20,7 +20,7 @@ use Modern::Perl; use utf8; -use Test::More tests => 16; +use Test::More tests => 17; use Test::Exception; use Test::MockModule; -- 2.34.1