https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18267
--- Comment #22 from Katrin Fischer <[email protected]> --- Hi Colin, there is a tiny conflict in EDI.pm: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 18267 populate_order_with_prices should be exported Applying: Bug 18267 Populate new price fields in EDI Processing Applying: Bug 18267 Populate new price fields in EDI Processing Using index info to reconstruct a base tree... M Koha/EDI.pm M Koha/Edifact/Line.pm Falling back to patching base and 3-way merge... Auto-merging Koha/EDI.pm CONFLICT (content): Merge conflict in Koha/EDI.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 18267 Populate new price fields in EDI Processing 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/patch-to-populate-price-fields-using-new-methods-1-4SHHyf.patch Hate to admit, but not sure which is the right line, can you take a look? Leaving status, another tester might have a better understanding of it than I do. -- 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/
