https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15565
Lisette Scheer <lisettesla...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #105 from Lisette Scheer <lisettesla...@gmail.com> --- Applying: Bug 15565: Place multiple holds at once for the same record on staff and OPAC. Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt M opac/opac-reserve.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-reserve.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Failed to merge in the changes. Patch failed at 0001 Bug 15565: Place multiple holds at once for the same record on staff and OPAC. The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch 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-15565-Place-multiple-holds-at-once-for-the-sam-kXB0M4.patch Lisette -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/