https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36831
--- Comment #33 from David Nind <[email protected]> --- Note the patch no longer applies: git bz apply 36831 Bug 36831 - Add support for .txt files to the KBART import tool 170562 - Bug 36831: Add a method to determine the file delimiter 170563 - Bug 36831: Move logic from the background job to the Title object class 170564 - Bug 36831: Allow for multiple file types 170565 - Bug 36831: Add unit test Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36831: Add a method to determine the file delimiter Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. Applying: Bug 36831: Move logic from the background job to the Title object class 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: Move logic from the background job to the Title object class -- 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/
