http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7710
--- Comment #62 from Christopher Brannon <[email protected]> --- I get the following errors when trying to load this patch in a sandbox: The sandbox you've requested is not ready. Some problems occurred applying patches from bug 7710: <h1>Something went wrong !</h1>Applying: Bug 7710 - multiple holds per title Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Reserves.pm 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/reserve/request.tt Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt Auto-merging opac/opac-reserve.pl Failed to merge in the changes. Patch failed at 0001 Bug 7710 - multiple holds per title 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 7710 - multiple holds per title 27429 - Bug 7710 - multiple holds per title Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-7710---multiple-holds-per-title-VSuTc4.patch . Christopher -- 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/
