http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13345 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #12 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Jonathan, there are some conflicts - can you please take a look and fix? Applying: Bug 13345: Allow patrons to choose format on sending basket/list by email Using index info to reconstruct a base tree... M C4/Biblio.pm M basket/basket.pl M basket/downloadcart.pl M basket/sendbasket.pl M koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt M opac/opac-downloadcart.pl M opac/opac-downloadshelf.pl M opac/opac-sendbasket.pl M opac/opac-sendshelf.pl M virtualshelves/downloadshelf.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 virtualshelves/downloadshelf.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 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-sendbasket.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 koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.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 C4/Biblio.pm 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: /home/katrin/kohaclone/.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". -- You are receiving this mail because: You are watching all bug changes.