https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36831 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #21 from David Nind <david@davidnind.com> --- Apologies for taking so long to re-test. The patch no longer applies 8-(... git bz apply 36831 Bug 36831 - Add support for .txt files to the KBART import tool 168431 - Bug 36831: Add a method to determine the file delimiter 168432 - Bug 36831: Move logic from the background job to the Title object class 168433 - Bug 36831: Allow for multiple file types 168434 - Bug 36831: Add unit test Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36831: Add a method to determine the file delimiter Applying: Bug 36831: Move logic from the background job to the Title object class Applying: Bug 36831: Allow for multiple file types Using index info to reconstruct a base tree... M Koha/REST/V1/ERM/EHoldings/Titles/Local.pm Falling back to patching base and 3-way merge... Auto-merging Koha/REST/V1/ERM/EHoldings/Titles/Local.pm CONFLICT (content): Merge conflict in Koha/REST/V1/ERM/EHoldings/Titles/Local.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 36831: Allow for multiple file types -- You are receiving this mail because: You are watching all bug changes.