https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8612
Jonathan Druart <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #37 from Jonathan Druart <[email protected]> --- Apply? [(y)es, (n)o, (i)nteractive] Applying: Bug 8612 - System preference to have custom fields in export csv basket Using index info to reconstruct a base tree... M acqui/basket.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging acqui/basket.pl CONFLICT (content): Merge conflict in acqui/basket.pl -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
