http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8367 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #75 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Jonathan, I am sorry, there are a couple of new conflicts now in this patch: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8367: Add more granular level for ReservesMaxPickUpDelay Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging opac/opac-user.pl CONFLICT (content): Merge conflict in opac/opac-user.pl Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-user.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 installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Failed to merge in the changes. Patch failed at 0001 Bug 8367: Add more granular level for ReservesMaxPickUpDelay 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-8367-Add-more-granular-level-for-ReservesMaxPi-BWSyFY.patch -- You are receiving this mail because: You are watching all bug changes.