https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25260 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |severine.queune@bulac.fr Status|Needs Signoff |Failed QA --- Comment #22 from Séverine Queune <severine.queune@bulac.fr> --- Applying: Bug 25260: Add a 'holds' table 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 Failed to merge in the changes. Patch failed at 0001 Bug 25260: Add a 'holds' table -- You are receiving this mail because: You are watching all bug changes.