http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6752 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de Patch Status|Needs Signoff |Does not apply --- Comment #9 from Katrin Fischer <katrin.fischer@bsz-bw.de> 2011-12-21 06:30:39 UTC --- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 6752: Be stricter with utf-8 encoding of output Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging cataloguing/ysearch.pl CONFLICT (content): Merge conflict in cataloguing/ysearch.pl Auto-merging misc/cronjobs/overdue_notices.pl Auto-merging misc/migration_tools/rebuild_zebra.pl Failed to merge in the changes. Patch failed at 0001 Bug 6752: Be stricter with utf-8 encoding of output When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.