http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11676 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #11 from Owen Leonard <oleonard@myacpl.org> --- This patch doesn't apply with git-bz. I'm not sure if it's a simple conflict or perhaps the patches are out of order? fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. -- You are receiving this mail because: You are watching all bug changes.