https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24606 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #6 from David Nind <david@davidnind.com> --- Patch no longer applies: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 24606: Update database, add new schema file Applying: Bug 24606: Add Koha Object(s) with unit tests Applying: Bug 24606: Update existing schema files [DO NOT PUSH] Using index info to reconstruct a base tree... M Koha/Schema/Result/Borrower.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Schema/Result/Borrower.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Borrower.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 24606: Update existing schema files [DO NOT PUSH] -- You are receiving this mail because: You are watching all bug changes.