# Conflicts:
#	comments-bundle/src/Resources/contao/dca/tl_comments.php
#	core-bundle/src/Resources/contao/drivers/DC_Folder.php
#	core-bundle/src/Resources/contao/modules/ModuleRegistration.php
#	core-bundle/src/Resources/contao/themes/flexible/main.css
#	core-bundle/src/Resources/contao/themes/flexible/main.min.css
#	core-bundle/src/Resources/contao/widgets/MetaWizard.php