Merge from 511_content-snapshot-product-admin-page

bluemwhitew · bluemwhitew · commit c2391ebedf3d · 2020-07-14T15:11:41.000+01:00
diff --git a/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php b/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php
@@ -12,7 +12,7 @@ class WysiwygConfigDataProcessor implements
     \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\WysiwygConfigDataProcessorInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
     {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class WysiwygConfigDataProcessor implements`
`12`	`12`	`\Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\WysiwygConfigDataProcessorInterface`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`		`- * {@inheritdoc}`
	`15`	`+ * @inheritdoc`
`16`	`16`	`*/`
`17`	`17`	`public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)`
`18`	`18`	`{`