Resolve conficts 2.4 develop upstream - Githubissues

mage-os / mageos-magento2

Work in progress.

Open Software License 3.0

208 stars 41 forks source link

Resolve conficts 2.4 develop upstream #85

Closed Vinai closed 7 months ago

Vinai commented 7 months ago

Description (*)

This PR resolves the conflict in the automatically openend PR https://github.com/mage-os/mageos-magento2/pull/78

Related Pull Requests

Contribution checklist (*)

[x] Pull request has a meaningful description of its purpose
[x] All commits are accompanied by meaningful commit messages
[x] All new or changed code is covered with unit/integration tests (if applicable)
[x] README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
[ ] All automated tests passed successfully (all builds are green)