[Koha-bugs] [Bug 19302] Pass objects to IsAvailableForItemLevelRequest

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

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

Hayley Mapley <hayleymapley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |hayleymapley at catalyst.net.n
                   |                            |z
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #7 from Hayley Mapley <hayleymapley at catalyst.net.nz> ---
Patch doesn't apply - merge conflicts, can you take a look?

Applying: Bug 19302: Send koha::objects to
C4::Reserves::IsAvailableForItemLevelRequest
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       C4/ILSDI/Services.pm
M       C4/Reserves.pm
M       opac/opac-reserve.pl
M       reserve/request.pl
M       t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
M       t/db_dependent/Reserves.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Reserves.t
Auto-merging t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
Auto-merging reserve/request.pl
Auto-merging opac/opac-reserve.pl
Auto-merging C4/Reserves.pm
CONFLICT (content): Merge conflict in C4/Reserves.pm
Auto-merging C4/ILSDI/Services.pm
Auto-merging C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 19302: Send koha::objects to
C4::Reserves::IsAvailableForItemLevelRequest

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