https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11529 Michal Denar <black23@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |black23@gmail.com --- Comment #60 from Michal Denar <black23@gmail.com> --- Hi Ere, i tested patches i get this error: Falling back to patching base and 3-way merge... Removing Koha/Schema/Result/Fieldmapping.pm Auto-merging Koha/Schema/Result/Biblio.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Biblio.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 11529: DBIx schema changes Can you rebase? -- You are receiving this mail because: You are watching all bug changes.