http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10402
Blain Laurence <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #4 from Blain Laurence <[email protected]> --- Sandbox setup by [email protected] with database 2 and bug 10402 on Tue Jun 25 17:48:05 2013 Something went wrong ! Applying: Bug 10402: Use an object for contacts Applying: Bug 10402: Move contacts to separate table Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Failed to merge in the changes. Patch failed at 0001 Bug 10402: Move contacts to separate table 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 10402 - Add multiple contacts for vendors Bug 10402: Use an object for contacts Apply? [yn] Bug 10402: Move contacts to separate table Apply? [yn] Patch left in /tmp/Bug-10402-Move-contacts-to-separate-table-KsaGBE.patch === translation installation === -- 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/
