Merge remote-tracking branch 'tangoc/MAGETWO-44686' into pullr

magento · Nov 2, 2015 · 281feb3 · 281feb3
2 parents 4e6eb59 + 2458a71
commit 281feb3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
@@ -418,7 +418,7 @@ protected function _initAttributes($entityType)
      *
      * @param   mixed $entityType
      * @param   mixed $code
-     * @return  \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|false
+     * @return  \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getAttribute($entityType, $code)