[Koha-bugs] [Bug 22284] Groups of pickup locations for holds

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

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

Liz Rea <wizzyrea at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #193 from Liz Rea <wizzyrea at gmail.com> ---
Hi, 

Applied this today with an eye to sign it off, and got a merge conflict :(

Applying: Bug 22284: New message, new column and filter pickup locations in
reserve/request.tt
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
M       reserve/request.pl
Falling back to patching base and 3-way merge...
Auto-merging reserve/request.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 22284: New message, new column and filter pickup
locations in reserve/request.tt

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