https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8179 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |severine.queune@bulac.fr --- Comment #10 from Séverine Queune <severine.queune@bulac.fr> --- Argh... so sad now 26635 applied correctly ! Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8179: Add tests Using index info to reconstruct a base tree... M t/db_dependent/Koha/Acquisition/Order.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Acquisition/Order.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Acquisition/Order.t Failed to merge in the changes. Patch failed at 0001 Bug 8179: Add tests -- You are receiving this mail because: You are watching all bug changes.