https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15773 Héctor Eduardo Castro Avalos <hector.hecaxmmx@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |hector.hecaxmmx@gmail.com --- Comment #2 from Héctor Eduardo Castro Avalos <hector.hecaxmmx@gmail.com> --- Hi Jonathan Patch fail in merge step. I've tried to apply 15771 on top but fails, applied alone 15773 but fails me too. Applying: Bug 15773: Fix and standardise checkboxes code in framework fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 15773: Fix and standardise checkboxes code in framework -- You are receiving this mail because: You are watching all bug changes.