https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20447
--- Comment #113 from Josef Moravec <[email protected]> --- (In reply to Michal Denar from comment #112) > Auto-merging Koha/Schema/Result/Branch.pm > CONFLICT (content): Merge conflict in Koha/Schema/Result/Branch.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 20447: DBIX schema changes Mike, these files could be easily regeneretad, just omit this one patch and run command 'dbic' on kohadevbox -- 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/
