https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14695
Julian Maurice <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #70 from Julian Maurice <[email protected]> --- Patches don't apply on master [...] Applying: Bug 14695 - Add ability to place multiple item holds on a given record per patron Using index info to reconstruct a base tree... M C4/Reserves.pm M Koha/Holds.pm M koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt M opac/opac-reserve.pl M reserve/request.pl Falling back to patching base and 3-way merge... Auto-merging reserve/request.pl Auto-merging opac/opac-reserve.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Auto-merging Koha/Holds.pm Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Failed to merge in the changes. Patch failed at 0001 Bug 14695 - Add ability to place multiple item holds on a given record per patron -- 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/
