https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23777
Bouzid Fergani <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |[email protected] --- Comment #24 from Bouzid Fergani <[email protected]> --- Hi, Thanks to rebase this patch. Bug 23777 - Text converted to html entity codes in cataloguing edit form 97685 - Bug 23777: Fix auth finder escaping 97686 - Bug 23777: Fix for the advanced editor 97687 - Bug 23777: Use To.json in preferences.tt 97688 - Bug 23777: Use To.json in authorities.tt 97689 - Bug 23777: Use To.json in results.tt 97690 - Bug 23777: Use TO.json in value_builder/unimarc_field_4XX.tt 97691 - Bug 23777: Use To.json in request.tt Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 23777: Fix auth finder escaping Applying: Bug 23777: Fix for the advanced editor Applying: Bug 23777: Use To.json in preferences.tt Applying: Bug 23777: Use To.json in authorities.tt Applying: Bug 23777: Use To.json in results.tt Using index info to reconstruct a base tree... 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 CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 23777: Use To.json in results.tt 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-23777-Use-Tojson-in-resultstt-VwtpJU.patch Thanks. Bouzid. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
