https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20588
--- Comment #3 from Alex Arnaud <alex.arn...@biblibre.com> --- (In reply to Nicolas Legrand from comment #2) > Hiya Alex, > > Applying: Bug 20588 - Apply dataTable on search fields and mapping tables > fatal: sha1 information is lacking or useless > (koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/ > mappings.tt). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 Bug 20588 - Apply dataTable on search fields and > mapping tables Hello Nicolas, Did you apply in order: 18316 and 20388 ? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
