http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6739 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #108 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am sorry, there is a conflict I can't resolve in this patch series: Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 6739 - expired patrons not blocked from opac actions - Followup 2 fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 6739 - expired patrons not blocked from opac actions - Followup 2 -- You are receiving this mail because: You are watching all bug changes.