fix: Resolving merge conflict https://github.com/mage-os/mageos-magen… - Githubissues

mage-os / mageos-magento2

Work in progress.

Open Software License 3.0

213 stars 45 forks source link

fix: Resolving merge conflict https://github.com/mage-os/mageos-magen… #58

Closed vitaliy-golomoziy closed 12 months ago

vitaliy-golomoziy commented 12 months ago

Description (*)

Resolved merge conflict according to Damien's guidline.