https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12224 --- Comment #20 from Marc Véron <veron@veron.ch> --- CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/en/mandatory/sample_notices.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/sample_notices.sql -- You are receiving this mail because: You are watching all bug changes.