http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5358
Jonathan Druart <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] | |m Patch Status|Signed Off |Does not apply --- Comment #4 from Jonathan Druart <[email protected]> 2012-01-02 09:19:51 UTC --- Applying: Bug 5358: Show cancelled orders in basket page Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Recorded preimage for 'koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt' Failed to merge in the changes. Patch failed at 0001 Bug 5358: Show cancelled orders in basket page -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. 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/
