@@ -, +, @@ --- 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 --- a/circ/pendingreserves.pl +++ a/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}, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/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 %]