http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336
--- Comment #8 from mathieu saby <mathieu.s...@univ-rennes2.fr> --- Still a conflit : CONFLICT (content): Merge conflict in installer/data/mysql/en/optional/auth_val.sql Auto-merging installer/data/mysql/de-DE/optional/auth_val.sql CONFLICT (content): Merge conflict in installer/data/mysql/de-DE/optional/auth_val.sql Failed to merge in the changes. M. Saby -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/
