https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24388
Jonathan Druart <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #3 from Jonathan Druart <[email protected]> --- (In reply to Michal Denar from comment #2) > Hi Jonathan, > can you rebase this patch? > > sing index info to reconstruct a base tree... > M t/db_dependent/Koha/Acquisition/Basket.t > Falling back to patching base and 3-way merge... > Auto-merging t/db_dependent/Koha/Acquisition/Basket.t > CONFLICT (content): Merge conflict in > t/db_dependent/Koha/Acquisition/Basket.t > error: Failed to merge in the changes. > Patch failed at 0001 Bug 24161: Add tests This patch is at the top of a long dependency list. -- 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/
