https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=31652 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #2 from David Nind <david@davidnind.com> --- The patch no longer applies 8-(... git bz apply 31652 Bug 31652 - Add geo-search 141406 - Bug 31652: Add geo-search Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 31652: Add geo-search .git/rebase-apply/patch:323: trailing whitespace. # can be single or multiple parameters separated by comma: kw,right-Truncation warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M Koha/SearchEngine/Elasticsearch.pm M Koha/SearchEngine/Elasticsearch/QueryBuilder.pm M Koha/SearchEngine/Elasticsearch/Search.pm M admin/searchengine/elasticsearch/field_config.yaml M admin/searchengine/elasticsearch/mappings.yaml M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt M opac/opac-search.pl .git/rebase-apply/patch:323: trailing whitespace. # can be single or multiple parameters separated by comma: kw,right-Truncation warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging opac/opac-search.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging admin/searchengine/elasticsearch/mappings.yaml Auto-merging admin/searchengine/elasticsearch/field_config.yaml CONFLICT (content): Merge conflict in admin/searchengine/elasticsearch/field_config.yaml Auto-merging Koha/SearchEngine/Elasticsearch/Search.pm Auto-merging Koha/SearchEngine/Elasticsearch/QueryBuilder.pm Auto-merging Koha/SearchEngine/Elasticsearch.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 31652: Add geo-search -- You are receiving this mail because: You are watching all bug changes.