Merge branch 'MAGETWO-63344' of github.com:magento-troll/magento2ce into MAGETWO-58456

slopukhov · slopukhov · commit 8cf56315ec59 · 2017-01-26T11:14:37.000+02:00
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php
@@ -107,7 +107,6 @@ protected function mapAssociatedEntities($entityType, $objectField)
 
     /**
      * @return $this
-     * @throws \Exception
      */
     protected function _afterLoad()
     {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ protected function mapAssociatedEntities($entityType, $objectField)`
`107`	`107`
`108`	`108`	`/**`
`109`	`109`	`* @return $this`
`110`		`- * @throws \Exception`
`111`	`110`	`*/`
`112`	`111`	`protected function _afterLoad()`
`113`	`112`	`{`