https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27859
Séverine Queune <severine.que...@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |severine.que...@bulac.fr --- Comment #10 from Séverine Queune <severine.que...@bulac.fr> --- Sorry David, patch needs rebase :/ Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 27859: marc search result export Using index info to reconstruct a base tree... M Koha/SearchEngine/Elasticsearch/Search.pm M catalogue/search.pl M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging catalogue/search.pl Auto-merging Koha/SearchEngine/Elasticsearch/Search.pm CONFLICT (content): Merge conflict in Koha/SearchEngine/Elasticsearch/Search.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 27859: marc search result export hint: Use 'git am --show-current-patch=diff' to see the failed patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://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/