https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8179
--- Comment #15 from Agustín Moyano <[email protected]> --- (In reply to Séverine Queune from comment #10) > 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 Hi, just rebased this bug. Could you please try again? Thanks! -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
