Merge remote-tracking branch '38809/patch-1' into julprs

engcom-Charlie · engcom-Charlie · commit af8b297f8334 · 2025-08-06T19:16:16.000+05:30
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
@@ -1,9 +1,7 @@
 <?php
 /**
- * Adminhtml block for fieldset of configurable product
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset;
 
@@ -101,7 +99,7 @@ public function getCurrentStore()
     }
 
     /**
-     * Returns additional values for js config, con be overridden by descendants
+     * Returns additional values for js config, can be overridden by descendants
      *
      * @return array
      */
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -203,7 +203,7 @@ public function getCurrentStore()
     }
 
     /**
-     * Returns additional values for js config, con be overridden by descendants
+     * Returns additional values for js config, can be overridden by descendants
      *
      * @return array
      */

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public function getCurrentStore()`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`/**`
`206`		`- * Returns additional values for js config, con be overridden by descendants`
	`206`	`+ * Returns additional values for js config, can be overridden by descendants`
`207`	`207`	`*`
`208`	`208`	`* @return array`
`209`	`209`	`*/`