[Koha-bugs] [Bug 3150] Move emails for sending cart and list contents into notices tool

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3150

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #141 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Hi Aleisha,

with bug 16522 now pushed, this no longer applies. Could you pleas rebase? 

Apply? [(y)es, (n)o, (i)nteractive] y
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=diff' to see the failed 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-3150-Move-emails-for-sending-cart-and-list-con-7TAJ75.patch

-- 
You are receiving this mail because:
You are watching all bug changes.