[Koha-bugs] [Bug 28529] Item type-constrained biblio-level holds should honour max_holds as item-level do

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28529

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #20 from David Nind <david at davidnind.com> ---
Patch no longer applies 8-(..

git bz apply 28529

Bug 28529 - Item type-constrained biblio-level holds should honour max_holds as
item-level do

134790 - Bug 28529: Add BiblioHoldItemTypeUseForRules system preference
134791 - Bug 28529: Unit tests
134792 - Bug 28529: Make biblio-level hold itemtype count against max rules

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 28529: Add BiblioHoldItemTypeUseForRules system preference
Applying: Bug 28529: Unit tests
Using index info to reconstruct a base tree...
M       t/db_dependent/Reserves.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Reserves.t
CONFLICT (content): Merge conflict in t/db_dependent/Reserves.t
error: Failed to merge in the changes.
Patch failed at 0001 Bug 28529: Unit tests

-- 
You are receiving this mail because:
You are watching all bug changes.