# Conflicts:
# .bowerrc
# Initializer.php
# backend/assets/AppAsset.php
# backend/config/params.php
# backend/config/test.php
# backend/controllers/SettingsController.php
# backend/controllers/SiteController.php
# backend/models/Analytics.php
# backend/tests/_bootstrap.php
# backend/tests/_data/login_data.php
# backend/tests/_support/FunctionalTester.php
# backend/tests/_support/UnitTester.php
# backend/tests/functional/LoginCest.php
# backend/tests/functional/_bootstrap.php
# backend/tests/unit/_bootstrap.php
# backend/views/ajax/_table.php
# backend/views/layouts/main.php
# backend/views/settings/settings.php
# backend/views/site/error.php
# backend/views/site/index.php
# backend/views/site/instruction.php
# backend/web/css/custom.css
# backend/web/css/site.css
# backend/web/js/custom.js
# common/components/Sitemap.php
# common/config/SitemapDynamic.php
# common/config/SitemapStatic.php
# common/config/params.php
# common/config/settings.php
# common/config/test.php
# common/fixtures/User.php
# common/mail/layouts/html.php
# common/mail/layouts/text.php
# common/mail/passwordResetToken-html.php
# common/mail/passwordResetToken-text.php
# common/models/Settings.php
# common/tests/_bootstrap.php
# common/tests/_data/user.php
# common/tests/_support/UnitTester.php
# common/tests/unit/models/LoginFormTest.php
# console/config/main.php
# console/config/params.php
# console/controllers/CreateController.php
# environments/dev/backend/config/main-local.php
# environments/dev/backend/config/params-local.php
# environments/dev/backend/config/test-local.php
# environments/dev/backend/web/index-test.php
# environments/dev/backend/web/index.php
# environments/dev/common/config/main-local.php
# environments/dev/common/config/params-local.php
# environments/dev/common/config/test-local.php
# environments/dev/console/config/main-local.php
# environments/dev/console/config/params-local.php
# environments/dev/frontend/config/main-local.php
# environments/dev/frontend/config/params-local.php
# environments/dev/frontend/config/test-local.php
# environments/dev/frontend/web/index-test.php
# environments/dev/frontend/web/index.php
# environments/dev/yii
# environments/dev/yii_test
# environments/index.php
# environments/prod/backend/config/main-local.php
# environments/prod/backend/config/params-local.php
# environments/prod/backend/web/index.php
# environments/prod/common/config/main-local.php
# environments/prod/common/config/params-local.php
# environments/prod/console/config/main-local.php
# environments/prod/console/config/params-local.php
# environments/prod/frontend/config/main-local.php
# environments/prod/frontend/config/params-local.php
# environments/prod/frontend/web/index.php
# environments/prod/yii
# frontend/config/main.php
# frontend/config/params.php
# frontend/config/test.php
# frontend/controllers/PageController.php
# frontend/tests/_bootstrap.php
# frontend/tests/_data/login_data.php
# frontend/tests/_data/user.php
# frontend/tests/_support/FunctionalTester.php
# frontend/tests/_support/UnitTester.php
# frontend/tests/acceptance/HomeCest.php
# frontend/tests/acceptance/_bootstrap.php
# frontend/tests/functional/AboutCest.php
# frontend/tests/functional/ContactCest.php
# frontend/tests/functional/HomeCest.php
# frontend/tests/functional/LoginCest.php
# frontend/tests/functional/SignupCest.php
# frontend/tests/functional/_bootstrap.php
# frontend/tests/unit/_bootstrap.php
# frontend/tests/unit/models/ContactFormTest.php
# frontend/tests/unit/models/PasswordResetRequestFormTest.php
# frontend/tests/unit/models/ResetPasswordFormTest.php
# frontend/tests/unit/models/SignupFormTest.php
# frontend/views/layouts/main.php
# frontend/views/site/contact.php
# frontend/views/site/error.php
# frontend/views/site/index.php
# frontend/web/css/custom.css
# frontend/web/js/gmaps.init.js
# frontend/web/sitemap.xml
# requirements.php
