[Koha-bugs] [Bug 13345] Choose the format when sending a basket/list by email

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

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

Séverine Queune <severine.queune at bulac.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |severine.queune at bulac.fr

--- Comment #33 from Séverine Queune <severine.queune at bulac.fr> ---
Falling back to patching base and 3-way merge...
Auto-merging virtualshelves/sendshelf.pl
CONFLICT (content): Merge conflict in virtualshelves/sendshelf.pl
Auto-merging virtualshelves/downloadshelf.pl
CONFLICT (modify/delete): t/Koha_Email.t deleted in HEAD and modified in Bug
13345: Allow patrons to choose format on sending basket/list by email. Version
Bug 13345: Allow patrons to choose format on sending basket/list by email of
t/Koha_Email.t left in tree.
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 opac/opac-downloadshelf.pl
Auto-merging opac/opac-downloadcart.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt
Auto-merging basket/sendbasket.pl
CONFLICT (content): Merge conflict in basket/sendbasket.pl
Auto-merging basket/downloadcart.pl
Auto-merging basket/basket.pl
Auto-merging Koha/Email.pm
CONFLICT (content): Merge conflict in Koha/Email.pm
Auto-merging C4/Biblio.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 13345: Allow patrons to choose format on sending
basket/list by email
The copy of the patch that failed is found in: .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-13345-Allow-patrons-to-choose-format-on-sendin-QUTNYW.patch

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