[Koha-bugs] [Bug 8449] Improve wording and styling for "cancelled holds" on Holds Awaiting Pickup screen

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

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

Julian Maurice <julian.maurice at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |julian.maurice at biblibre.com

--- Comment #2 from Julian Maurice <julian.maurice at biblibre.com> ---
Patch doesn't apply anymore

Applying: Bug 8449 - Improve wording and styling for "cancelled holds" on Holds
Awaiting Pickup screen
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 8449 - Improve wording and styling for "cancelled
holds" on Holds Awaiting Pickup screen

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