https://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 #15 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am sorry, conflicting again: 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 opac/opac-downloadshelf.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.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 Will return to this asap when rebased. -- You are receiving this mail because: You are watching all bug changes.