http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12827
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |[email protected] --- Comment #14 from Paola Rossi <[email protected]> --- I've tried to apply against master 3.17.00.023 There is a conflict in the tests: Applying: Bug 12827: NewOrder should not return basketno Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Budgets.t Auto-merging t/db_dependent/Acquisition/CancelReceipt.t CONFLICT (content): Merge conflict in t/db_dependent/Acquisition/CancelReceipt.t Auto-merging C4/Acquisition.pm Failed to merge in the changes. Patch failed at 0001 Bug 12827: NewOrder should not return basketno I pass the patch to "Patch doesn't apply" status. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
