http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12747
--- Comment #17 from Marc Véron <[email protected]> --- Charles, I'm sorry, I was not fast enough, after the newest pushes both patches again do not apply. For the first patch you can remove your changes from installer/data/mysql/updatedatabase.pland follow the new rules in http://wiki.koha-community.org/wiki/Database_updates See part updatedatabase.pl Oh, have a look at C4/Breeding.pm in the second patch, you have remaining lines from merging like: <<<<<<< HEAD ======= (....) >>>>>>> c4c12ed... Bug 12747 - Add extra column in Z3950 search result -- 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/
