https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39017
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #2 from David Nind <[email protected]> --- The patch no longer applies (on the latest main) 8-(... git bz apply 39017 Bug 39017 - Typo: "Does not exists" 180620 - Bug 39017: update "Does not exists" Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39017: update "Does not exists" Using index info to reconstruct a base tree... M Koha/SimpleMARC.pm M admin/auth_tag_structure.pl M admin/marctagstructure.pl M patroncards/create-pdf.pl M serials/create-numberpattern.pl Falling back to patching base and 3-way merge... Auto-merging serials/create-numberpattern.pl CONFLICT (content): Merge conflict in serials/create-numberpattern.pl Auto-merging patroncards/create-pdf.pl CONFLICT (content): Merge conflict in patroncards/create-pdf.pl Auto-merging admin/marctagstructure.pl CONFLICT (content): Merge conflict in admin/marctagstructure.pl Auto-merging admin/auth_tag_structure.pl CONFLICT (content): Merge conflict in admin/auth_tag_structure.pl Auto-merging Koha/SimpleMARC.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 39017: update "Does not exists" -- 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/
