Upstream Merge Conflict (2.4-develop) #103
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added an element and updated test file
…e during component upgrade-Fix unit tests
Merge 2.4-develop into AC-12085
…Tier4-Kings-PR-08-23-2024
…Tier4-Kings-PR-08-23-2024
…Tier4-Kings-PR-08-23-2024
…Tier4-Kings-PR-08-23-2024
…into ACQE-6897-functional-mainline-deployment
Merge 2.4-develop into AC-12085
…e during component upgrade-Fix unit tests
…wn on PayPal express checkout review page
…wn on PayPal express checkout review page Added fix for the PR
…wn on PayPal express checkout review page Added fix for the PR
Created AGs and updated those in test file
…/magento2ce into Tier4-09-12-2024
…/magento2ce into Tier4-09-12-2024
…/magento2ce into Tier4-09-12-2024
[Support Tier-4 mrosmeteniuc] 08-05-2024 Regular delivery of bugfixes and improvements
…/magento2ce into Tier4-09-12-2024
…tier-4/magento2ce into Tier4-09-12-2024
Tier 4 PR Delivery 09-12-2024
This reverts commit c3b7947.
…Delivery_07162024
[Arrows] Delivery of PHPUnit 10 Deprecations removal
…Tier4-Kings-PR-09-27-2024
…-27-2024 [Support Tier-4-Kings glo23503] 09.27.2024 Regular delivery of bugfixes and improvements
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.