https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28327
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #41 from David Nind <[email protected]> --- Patch no longer applies 8-(.. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 28327: Add unit tests Applying: Bug 28327: Unify CSV delimiter special behavior for tabulation Using index info to reconstruct a base tree... M C4/Context.pm M koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc M koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt M reports/cash_register_stats.pl M reports/guided_reports.pl Falling back to patching base and 3-way merge... Auto-merging reports/guided_reports.pl Auto-merging reports/cash_register_stats.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc Auto-merging C4/Context.pm CONFLICT (content): Merge conflict in C4/Context.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 28327: Unify CSV delimiter special behavior for tabulation -- 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/
