https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36509
David Nind <da...@davidnind.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |da...@davidnind.com
Status|Needs Signoff |Patch doesn't apply
--- Comment #3 from David Nind <da...@davidnind.com> ---
The patch no longer applies 8-(...
git bz apply 36509
Bug 36509 - Add option to search authority records by ID
164576 - Bug 36509: Add Search ID tab to authorities search on staff interface
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 36509: Add Search ID tab to authorities search on staff interface
Using index info to reconstruct a base tree...
M Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
M admin/searchengine/elasticsearch/mappings.yaml
M koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
Auto-merging admin/searchengine/elasticsearch/mappings.yaml
Auto-merging Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 36509: Add Search ID tab to authorities search on
staff interface
--
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/
