https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16431 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |bgkriegel@gmail.com --- Comment #2 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Master is moving fast fatal: sha1 information is lacking or useless (admin/biblio_framework.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 16431: Use Koha::Cache to cache marc subfield structure -- You are receiving this mail because: You are watching all bug changes.