https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29495 --- Comment #48 from Andrew Fuerste-Henry <andrew@bywatersolutions.com> --- I'm getting a qa failure after applying these to 21.05. Should this maybe depend on bug 28588? Please rebase for backport to 21.05 if possible. Thanks! Here's the error I got: FAIL t/db_dependent/Koha/Checkouts/ReturnClaim.t FAIL valid Version control conflict marker Version control conflict marker Type of arg 1 to Test::Exception::throws_ok must be block or sub {} (not reference constructor) Type of arg 1 to Test::Exception::throws_ok must be block or sub {} (not reference constructor) Type of arg 1 to Test::Exception::throws_ok must be block or sub {} (not reference constructor) Version control conflict marker t/db_dependent/Koha/Checkouts/ReturnClaim.t had compilation errors. -- You are receiving this mail because: You are watching all bug changes.