From ae3d4bec4952138d092a93c02844d0cf5f687cdb Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Fri, 18 Dec 2020 10:43:23 +0000 Subject: [PATCH] Bug 15516: (follow-up) Fix QA and rebase issues --- circ/pendingreserves.pl | 1 - .../prog/en/modules/members/moremember.tt | 2 +- reserve/placerequest.pl | 2 +- t/db_dependent/Reserves/HoldCount.t | 20 ++++++++++---------- 4 files changed, 12 insertions(+), 13 deletions(-) mode change 100644 => 100755 t/db_dependent/Reserves/HoldCount.t diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index 9fc399a437..576470e737 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -252,7 +252,6 @@ $sth->execute(@query_params); while ( my $data = $sth->fetchrow_hashref ) { push( @reservedata, { -<<<<<<< HEAD reservedate => $data->{l_reservedate}, firstname => $data->{firstname} || '', surname => $data->{surname}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 32984cd8d6..8e8931131a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -944,7 +944,7 @@ [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] [% Asset.js("js/messaging-preference-form.js") | $raw %] - [% Asset.js("js/hold-group.js") %] + [% Asset.js("js/hold-group.js") | $raw %]