https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14493
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #12 from Séverine Queune <[email protected]> --- Bug 14493 - export_borrowers.pl - Export patron attributes 41341 - export_borrowers.pl changed to support patron attributes 89574 - Bug 14493: export_borrowers.pl - Export patron attributes Apply? [(y)es, (n)o, (i)nteractive] y Applying: export_borrowers.pl changed to support patron attributes Using index info to reconstruct a base tree... M misc/export_borrowers.pl Falling back to patching base and 3-way merge... Auto-merging misc/export_borrowers.pl CONFLICT (content): Merge conflict in misc/export_borrowers.pl Failed to merge in the changes. Patch failed at 0001 export_borrowers.pl changed to support patron attributes -- 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/
