http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8236
Aurélie Fichot <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #61 from Aurélie Fichot <[email protected]> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 8236: <h1>Something went wrong !</h1>Applying: Bug 8236 Block renewing for overdue items Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Circulation.pm Auto-merging circ/circulation.pl Auto-merging installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging members/moremember.pl Failed to merge in the changes. Patch failed at 0001 Bug 8236 Block renewing for overdue items 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. Bug 8236 - Prevent renewing if overdue or restriction 21223 - Bug 8236 Block renewing for overdue items Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-8236-Block-renewing-for-overdue-items-RX74cM.patch . -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
