[Koha-bugs] [Bug 31391] Staff-side recalls

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #10 from David Nind <david at davidnind.com> ---
Patch no longer applies 8-(..

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 31391: RecallsInterface system preference
Applying: Bug 31391: Recalled authorised value for hold cancellation
Applying: Bug 31391: Implement RecallsInterface on OPAC
Applying: Bug 31391: Request recalls and convert reserves on staff interface
Using index info to reconstruct a base tree...
M       Koha/Item.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
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
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt
Auto-merging Koha/Item.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 31391: Request recalls and convert reserves on staff
interface

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