http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7710
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply QA Contact|[email protected] | --- Comment #52 from Katrin Fischer <[email protected]> --- Hi Kyle, could you please give feedback? (comment 50 and comment 51) There are also a couple of conflicts - I was not sure how to resolve the one in reserve.pl. Apply? [(y)es, (n)o, (i)nteractive] y 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 reserve/request.pl CONFLICT (content): Merge conflict in reserve/request.pl Auto-merging opac/opac-reserve.pl Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.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/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging C4/Reserves.pm 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". Patch left in /tmp/Bug-7710---multiple-holds-per-title-KL3g2b.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/
