http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5565
Paul Poulain <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Patch Status|Needs Signoff |Does not apply --- Comment #3 from Paul Poulain <[email protected]> 2011-09-27 15:47:48 UTC --- the patch pointed by MJ & Frederic does not apply : 17:45 ~/koha.dev/koha-community (BZ5565 $%)$ git am -3 BZ5565.eml Applying: Bug 5565 UNIMARC to DC XSL tidy up fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 5565 UNIMARC to DC XSL tidy up 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. _______________________________________________ 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/
