https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19482
Alex Arnaud <alex.arn...@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #21 from Alex Arnaud <alex.arn...@biblibre.com> --- Applying: Bug 19482 - DB changes Applying: Bug 19482 - Add support for defining 'mandatory' mappings Using index info to reconstruct a base tree... M admin/searchengine/elasticsearch/mappings.pl M koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt Falling back to patching base and 3-way merge... 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 error: Failed to merge in the changes. Patch failed at 0001 Bug 19482 - Add support for defining 'mandatory' mappings The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-19482---Add-support-for-defining-mandatory-map-fo6gJt.patch -- 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/