http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7162
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Patch Status|Needs Signoff |Does not apply --- Comment #4 from Katrin Fischer <[email protected]> 2011-12-21 20:47:13 UTC --- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 7162: Factorize code for order cancellation Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Acquisition.pm Auto-merging acqui/addorder.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Failed to merge in the changes. Patch failed at 0001 Bug 7162: Factorize code for order cancellation When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- 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/
