https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22008
Maryse Simard <maryse.sim...@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |maryse.sim...@inlibro.com --- Comment #11 from Maryse Simard <maryse.sim...@inlibro.com> --- Patch doesn't apply Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22008: Add missing constraints to accountlines Using index info to reconstruct a base tree... M installer/data/mysql/kohastructure.sql Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 22008: Add missing constraints to accountlines -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/