[Koha-bugs] [Bug 8367] How long is a hold waiting for pickup at a more granular level

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

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

Paola Rossi <paola.rossi at cineca.it> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Failed QA                   |Patch doesn't apply

--- Comment #93 from Paola Rossi <paola.rossi at cineca.it> ---
I've tried to apply the patch against master 3.19.00.002

Applying: Bug 8367 - How long is a hold waiting for pickup at a more granular
level
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Holds.t
Auto-merging svc/holds
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
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
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/holds.js
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging circ/waitingreserves.pl
Auto-merging C4/Reserves.pm
Auto-merging C4/Letters.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 8367 - How long is a hold waiting for pickup at a more
granular level

So I pass the patch to "Patch doesn't apply" status.

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