Closed mage-os-ci closed 1 month ago
This PR was automatically generated: a human is required.
Auto-merging app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php Auto-merging app/code/Magento/Backend/view/adminhtml/layout/default.xml Auto-merging app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php Auto-merging app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php Auto-merging app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php Auto-merging app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php Auto-merging app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less Auto-merging composer.json Auto-merging dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php Auto-merging dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php CONFLICT (content): Merge conflict in dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php Auto-merging dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json Auto-merging dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpirationTest.php Auto-merging lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php Auto-merging lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php Automatic merge failed; fix conflicts and then commit the result.
This PR was automatically generated: a human is required.
Auto-merging app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php Auto-merging app/code/Magento/Backend/view/adminhtml/layout/default.xml Auto-merging app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php Auto-merging app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php Auto-merging app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php Auto-merging app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php Auto-merging app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less Auto-merging composer.json Auto-merging dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php Auto-merging dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php CONFLICT (content): Merge conflict in dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php Auto-merging dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json Auto-merging dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpirationTest.php Auto-merging lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php Auto-merging lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php Automatic merge failed; fix conflicts and then commit the result.