# Conflicts:
#	README.md
#	backend/config/main.php
#	backend/web/.gitignore
#	backend/web/js/table-manage-colvis.demo.js
#	common/components/AdminController.php
#	common/components/BaseForm.php
#	common/components/ColorActionColumn.php
#	common/modules/content/controllers/PageController.php
#	common/modules/content/models/CoContent.php
#	common/modules/faq/models/Faq.php
#	composer.json
#	console/config/main.php
#	environments/prod/common/config/main-local.php
#	frontend/assets/AppAsset.php
#	frontend/config/main.php
#	frontend/config/params.php
#	frontend/views/layouts/head.php
#	frontend/views/layouts/main.php
#	frontend/web/css/style.css
#	frontend/web/favicon.ico
#	frontend/web/images/logo.png