https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11529
Michal Denar <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #60 from Michal Denar <[email protected]> --- 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. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
