Conflicts:
	component/mariadb/buildout.cfg
	component/sphinx/buildout.cfg
	slapos/recipe/generic_mysql/template/my.cnf.in
	software/erp5/software.cfg