https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3150 --- Comment #63 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(.. Applying: Bug 3150: Move emails for sending cart and list contents to notices Using index info to reconstruct a base tree... M basket/sendbasket.pl M opac/opac-sendbasket.pl M opac/opac-sendshelf.pl M virtualshelves/sendshelf.pl Falling back to patching base and 3-way merge... Auto-merging virtualshelves/sendshelf.pl CONFLICT (content): Merge conflict in virtualshelves/sendshelf.pl Auto-merging opac/opac-sendshelf.pl CONFLICT (content): Merge conflict in opac/opac-sendshelf.pl Auto-merging opac/opac-sendbasket.pl CONFLICT (content): Merge conflict in opac/opac-sendbasket.pl Auto-merging basket/sendbasket.pl CONFLICT (content): Merge conflict in basket/sendbasket.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 3150: Move emails for sending cart and list contents to notices hint: Use 'git am --show-current-patch' to see the failed patch -- You are receiving this mail because: You are watching all bug changes.