https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26684 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #14 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(.. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 26684: Remove marc from auth_header for new installs Using index info to reconstruct a base tree... M C4/AuthoritiesMarc.pm M installer/data/mysql/kohastructure.sql Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging C4/AuthoritiesMarc.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 26684: Remove marc from auth_header for new installs Also, is there a test plan? I have no idea how to test this one... -- You are receiving this mail because: You are watching all bug changes.