Merge remote-tracking branch 'origin/MAGETWO-54296' into troll_bugfix

rganin · rganin · commit bc4c58890a76 · 2016-10-19T13:28:31.000+03:00
diff --git a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
@@ -125,7 +125,7 @@ public function afterSave()
     }
 
     /**
-     * @return $this
+     * {@inheritdoc}
      */
     public function afterDeleteCommit()
     {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function afterSave()`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`/**`
`128`		`- * @return $this`
	`128`	`+ * {@inheritdoc}`
`129`	`129`	`*/`
`130`	`130`	`public function afterDeleteCommit()`
`131`	`131`	`{`