http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5742
MathildeF <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mathilde.formery@ville-nime | |s.fr --- Comment #17 from MathildeF <[email protected]> --- I have tested the patch in a sandbox and it don't works. Something went wrong ! Applying: But 5742: Batch edit patrons Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Members.pm CONFLICT (content): Merge conflict in C4/Members.pm Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt Failed to merge in the changes. Patch failed at 0001 But 5742: Batch edit patrons When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 5742 - batch edit patrons -- You are receiving this mail because: You are the QA Contact for the bug. 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/
