Merge branch 'ACP2E-31' of https://github.com/magento-l3/magento2ce into L3-PR-20211001

ArtemVasyliev · ArtemVasyliev · commit 3c9343c18566 · 2021-11-09T14:49:54.000-06:00
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -13,7 +13,7 @@
 class Totals extends \Magento\Sales\Block\Order\Totals
 {
     /**
-     * Admin helper
+     * Sales admin helper object
      *
      * @var \Magento\Sales\Helper\Admin
      */
diff --git a/app/code/Magento/Sales/Block/Order/Totals.php b/app/code/Magento/Sales/Block/Order/Totals.php
@@ -32,7 +32,7 @@ class Totals extends \Magento\Framework\View\Element\Template
     protected $_order = null;
 
     /**
-     * Core registry
+     * Core registry object
      *
      * @var \Magento\Framework\Registry
      */

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`class Totals extends \Magento\Sales\Block\Order\Totals`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`		`- * Admin helper`
	`16`	`+ * Sales admin helper object`
`17`	`17`	`*`
`18`	`18`	`* @var \Magento\Sales\Helper\Admin`
`19`	`19`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class Totals extends \Magento\Framework\View\Element\Template`
`32`	`32`	`protected $_order = null;`
`33`	`33`
`34`	`34`	`/**`
`35`		`- * Core registry`
	`35`	`+ * Core registry object`
`36`	`36`	`*`
`37`	`37`	`* @var \Magento\Framework\Registry`
`38`	`38`	`*/`