http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6752
--- Comment #7 from Paul Poulain <[email protected]> 2011-11-06 10:18:05 UTC --- sorry, but it does not apply anymore against master : 11:08 ~/koha.dev/koha-community (new/bug_6752 $%)$ git am -3 /tmp/Signed-off-patch-OH345M.patch 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 admin/aqplan.pl Auto-merging circ/overdue.pl CONFLICT (content): Merge conflict in circ/overdue.pl Auto-merging circ/ypattrodue-attr-search-authvalue.pl CONFLICT (content): Merge conflict in circ/ypattrodue-attr-search-authvalue.pl Auto-merging circ/ysearch.pl CONFLICT (content): Merge conflict in circ/ysearch.pl Auto-merging misc/migration_tools/rebuild_zebra.pl Auto-merging misc/translator/xgettext.pl CONFLICT (content): Merge conflict in misc/translator/xgettext.pl Auto-merging tools/export.pl Failed to merge in the changes. Patch failed at 0001 Bug 6752: Be stricter with utf-8 encoding of output I planned to test at least some of them before pushing, and will do that once you submit a rebases patch. -- 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. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
