[Koha-bugs] [Bug 30825] Get rid of GetReservesControlBranch

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |david at davidnind.com

--- Comment #32 from David Nind <david at davidnind.com> ---
The patches no longer apply... 8-(

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 30825: Add unit tests
Using index info to reconstruct a base tree...
M       t/db_dependent/Koha/Item.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Koha/Item.t
Applying: Bug 30825: Add Koha::Item->holds_control_library
Applying: Bug 30825: Remove GetReservesControlBranch in favour of
Koha::Item->holds_control_library
Using index info to reconstruct a base tree...
M       C4/Reserves.pm
M       opac/opac-reserve.pl
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
Auto-merging opac/opac-reserve.pl
CONFLICT (content): Merge conflict in opac/opac-reserve.pl
Auto-merging C4/Reserves.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 30825: Remove GetReservesControlBranch in favour of
Koha::Item->holds_control_library

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