Upstream Merge Conflict (2.4-develop) #86
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
…, the order has incorrect total - without test
…1.2.0) with mftf upgrade-changes for ce
…1.2.0) with mftf upgrade-changes for ce
…into AC-9196main
…1.2.0) with mftf upgrade-changes for ce
There is no need in the _if_ as Subtotal Incl Tax does not contain Weee tax even for the last invoice of the order
[LYNX] Multicoupon delivery PR
…ealth_247Beta3_30Jan23
Arrows Team - Feature delivery
[Spartans] Bugfix Delivery
…m_Health_247Beta3_30Jan23
…ta3_30Jan23 Hammer platform health 247-beta3
[Spartans] Bugfix Delivery
Chore: resolve merge conflicts
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/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
Auto-merging app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
Auto-merging app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
Auto-merging app/design/adminhtml/Magento/backend/web/css/source/_actions.less
Auto-merging app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
Auto-merging app/design/adminhtml/Magento/backend/web/css/source/variables/_components.less
CONFLICT (content): Merge conflict in app/design/adminhtml/Magento/backend/web/css/source/variables/_components.less
Auto-merging app/design/adminhtml/Magento/backend/web/css/source/variables/_structure.less
Auto-merging composer.json
Automatic merge failed; fix conflicts and then commit the result.