ACPT-675

JacobBrownAustin · JacobBrownAustin · commit 1cb5d2fddcc4 · 2022-10-14T11:25:04.000-05:00
removing extra @see from merge conflict
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -227,7 +227,6 @@ class Product extends AbstractEntity
      * Links attribute name-to-link type ID.
      *
      * @deprecated 101.1.0 use DI for LinkProcessor class if you want to add additional types
-     * @see LinkProcessor
      *
      * @see Magento_CatalogImportExport::etc/di.xml
      * @var array

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,6 @@ class Product extends AbstractEntity`
`227`	`227`	`* Links attribute name-to-link type ID.`
`228`	`228`	`*`
`229`	`229`	`* @deprecated 101.1.0 use DI for LinkProcessor class if you want to add additional types`
`230`		`- * @see LinkProcessor`
`231`	`230`	`*`
`232`	`231`	`* @see Magento_CatalogImportExport::etc/di.xml`
`233`	`232`	`* @var array`