https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19780
--- Comment #9 from Katrin Fischer <[email protected]> --- I think there went something wrong when Hayley rebased it, so old and new patch were both on the bug, but even after obsoleting the older, this won't apply: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19780 - Updating the invoice costs after updating of the actual value post receiving of the order Using index info to reconstruct a base tree... M acqui/neworderempty.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging acqui/neworderempty.pl CONFLICT (content): Merge conflict in acqui/neworderempty.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 19780 - Updating the invoice costs after updating of the actual value post receiving of the order The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Fixed-merge-conflicts---zTWP_q.patch -- 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/
