-
# Conflicts: # common/modules/product/widgets/views/product_smart.php # common/modules/product/widgets/views/products_block.php # frontend/views/catalog/product_item.php
-
# Conflicts: # composer.json # frontend/web/css/style.css
-
# Conflicts: # frontend/web/css/style.css
-
# Conflicts: # backend/controllers/BrandController.php # backend/views/brand/_form.php # common/modules/product/models/Brand.php # common/modules/product/widgets/views/products_block.php