mirror of
https://github.com/bdnugget/magento2.git
synced 2026-11-07 09:17:35 +00:00
# Conflicts: # app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php # app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php # app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php # app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImport/ProcessorTest.php # app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php # app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ChangeDetectorTest.php # app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php # app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php # dev/tests/integration/testsuite/Magento/Deploy/Console/Command/App/ConfigImportCommandTest.php