https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24718 Emmi Takkinen <emmi.takkinen@koha-suomi.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |emmi.takkinen@koha-suomi.fi Status|Needs Signoff |Patch doesn't apply --- Comment #65 from Emmi Takkinen <emmi.takkinen@koha-suomi.fi> --- There is a minor merge conflict in t/db_dependent/Holds.t while trying to apply patch "Bug 24718: Hour based holds on staff client". I was able to resolve this, but Koha now dies on Internal Server Error. Looking from locks there are these lines: Global symbol "$expdate" requires explicit package name (did you forget to declare "my $expdate"?) at ../Koha/C4/Reserves.pm line 216." (and several others) Type of arg 1 to List::MoreUtils::XS::any must be block or sub {} (not reference constructor) at ../Koha/C4/Reserves.pm line 1848, near "$ignore_borrowers ;" Setting this status as "Patch doesn't apply". -- You are receiving this mail because: You are watching all bug changes.