https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6918
--- Comment #23 from Katrin Fischer <[email protected]> --- This is still a desirable feature, but the existing patch is quite old and possibly needs a more or less complete rewrite: Falling back to patching base and 3-way merge... Auto-merging opac/opac-search.pl Auto-merging opac/opac-detail.pl CONFLICT (content): Merge conflict in opac/opac-detail.pl Auto-merging opac/opac-MARCdetail.pl CONFLICT (content): Merge conflict in opac/opac-MARCdetail.pl Auto-merging opac/opac-ISBDdetail.pl CONFLICT (content): Merge conflict in opac/opac-ISBDdetail.pl CONFLICT (modify/delete): C4/VirtualShelves/Page.pm deleted in HEAD and modified in Bug 6918 - can't place holds on 'on order' items with AllowOnShelfHolds off. Version Bug 6918 - can't place holds on 'on order' items with AllowOnShelfHolds off of C4/VirtualShelves/Page.pm left in tree. Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Auto-merging C4/Biblio.pm Failed to merge in the changes. Patch failed at 0001 Bug 6918 - can't place holds on 'on order' items with AllowOnShelfHolds off ... Can we move this back to NEW? -- You are receiving this mail because: You are watching all bug changes. You are the QA Contact for the bug. _______________________________________________ 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/
