search

mage-os / mageos-magento2

Work in progress.
Open Software License 3.0
213 stars 45 forks source link

Upstream Merge Conflict (2.4-develop) #86

Closed mage-os-ci closed 9 months ago

mage-os-ci commented 9 months ago

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.