http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7001 --- Comment #87 from Paul Poulain <paul.poulain@biblibre.com> --- yikes... could you please squash both patches, I can't deal with 2: * the 1st can't apply because of updatedatabase merge problem (of course). I deal with that, but then, * the 2nd can't be applied at all anymore: Applying: bug_7001: Added TRANSFERSLIP to the letters fatal: sha1 information is lacking or useless (installer/data/mysql/en/mandatory/sample_notices.sql). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 bug_7001: Added TRANSFERSLIP to the letters a squashed patch will work like a charm probably ! -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.