Skip to content
This repository has been archived by the owner on Dec 19, 2019. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/2.3-develop-18387-catalog-images…
Browse files Browse the repository at this point in the history
…-resize' into 2.3-develop-18387-catalog-images-resize

# Conflicts:
#	app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
  • Loading branch information
vpodorozh committed Oct 30, 2018
2 parents c95ce3c + 12f8396 commit c1aa5bc
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Magento\Framework\DB\Select;
use Magento\Framework\App\ResourceConnection;

/*
/**
* Class for retrieval of all product images
*/
class Image
Expand Down

0 comments on commit c1aa5bc

Please sign in to comment.