Merge branch 'MAGETWO-65483' into MAGETWO-65480

zakdma · zakdma · commit ea4675590cd7 · 2017-03-10T16:42:09.000+02:00
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -932,7 +932,6 @@ public function getResizedImageInfo()
         return getimagesize($image);
     }
 
-
     /**
      * Retrieve misc params based on all image attributes
      *

Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,6 @@ public function getResizedImageInfo()`
`932`	`932`	`return getimagesize($image);`
`933`	`933`	`}`
`934`	`934`
`935`		`-`
`936`	`935`	`/**`
`937`	`936`	`* Retrieve misc params based on all image attributes`
`938`	`937`	`*`