[Koha-bugs] [Bug 14514] LocalHoldsPriority and the HoldsQueue conflict with each other

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

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

Srdjan Jankovic <srdjan at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |srdjan at catalyst.net.nz

--- Comment #5 from Srdjan Jankovic <srdjan at catalyst.net.nz> ---
Applying: Bug 14514 - LocalHoldsPriority and the HoldsQueue conflict with each
other
Using index info to reconstruct a base tree...
M       C4/HoldsQueue.pm
M       t/db_dependent/HoldsQueue.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/HoldsQueue.t
CONFLICT (content): Merge conflict in t/db_dependent/HoldsQueue.t
Auto-merging C4/HoldsQueue.pm
Failed to merge in the changes.

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