[Koha-bugs] [Bug 12892] Holds Waiting: not showing from check out screen

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12892

Nick Clemens <nick at quecheelibrary.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |nick at quecheelibrary.org

--- Comment #27 from Nick Clemens <nick at quecheelibrary.org> ---
Applying: Bug 12892 - Holds Waiting: not showing from check out screen
Using index info to reconstruct a base tree...
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 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging circ/circulation.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 12892 - Holds Waiting: not showing from check out
screen
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-12892---Holds-Waiting-not-showing-from-check-o-xSl9aQ.patch

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