http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12802 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #45 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Conflicts in both first and second patch, please rebase! Apply? [(y)es, (n)o, (i)nteractive] i Applying: Bug 12802: Sent notices using several email addresses Using index info to reconstruct a base tree... M C4/Branch.pm M C4/Letters.pm M C4/Members.pm M C4/Message.pm M C4/Reserves.pm M misc/cronjobs/overdue_notices.pl M opac/opac-memberentry.pl M opac/opac-shareshelf.pl M t/db_dependent/Letters.t M t/db_dependent/Members.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Members.t Auto-merging t/db_dependent/Letters.t CONFLICT (content): Merge conflict in t/db_dependent/Letters.t Auto-merging opac/opac-shareshelf.pl Auto-merging opac/opac-memberentry.pl Auto-merging misc/cronjobs/overdue_notices.pl Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Auto-merging C4/Message.pm Auto-merging C4/Members.pm Auto-merging C4/Letters.pm Auto-merging C4/Branch.pm Failed to merge in the changes. Patch failed at 0001 Bug 12802: Sent notices using several email addresses 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". Patch left in /tmp/Bug-12802-Sent-notices-using-several-email-address-C2M_Ge.patch -- You are receiving this mail because: You are watching all bug changes.