http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13891 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |veron@veron.ch --- Comment #6 from Marc Véron <veron@veron.ch> --- Patch does not apply: Applying: Bug 13891: DataTables server-side processing - budget users Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt Removing koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_user_search.tt Removing admin/aqbudget_user_search.pl Applying: Bug 13891: DataTables server-side processing - Serial recipients Applying: Bug 13891: DataTables server-side processing - patron cards Applying: Bug 13891: DataTables server-side processing - Fix regressions fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 13891: DataTables server-side processing - Fix regressions -- You are receiving this mail because: You are watching all bug changes.