[Koha-bugs] [Bug 20388] Elasticsearch - Ability to add search fields from UI

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20388

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |david at davidnind.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #122 from David Nind <david at davidnind.com> ---
Patch no longer applies 8-(..

git bz apply 20388

Bug 20388 - Elasticsearch - Ability to add search fields from UI

120104 - Bug 20388 - Elasticsearch - Ability to add search fields from UI

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 20388 - Elasticsearch - Ability to add search fields from UI
Using index info to reconstruct a base tree...
M       Koha/SearchField.pm
M       admin/searchengine/elasticsearch/mappings.pl
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
M       koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js
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 admin/searchengine/elasticsearch/mappings.pl
Auto-merging Koha/SearchField.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 20388 - Elasticsearch - Ability to add search fields
from UI

-- 
You are receiving this mail because:
You are watching all bug changes.