cia-2.4.7-beta1-develop-bugfixes-01132023

pawan-adobe-security · pawan-adobe-security · commit 7b1163fcd016 · 2023-01-13T23:07:39.000+05:30
resolve conflict
diff --git a/app/code/Magento/Quote/Model/BillingAddressManagement.php b/app/code/Magento/Quote/Model/BillingAddressManagement.php
@@ -109,6 +109,7 @@ public function get($cartId)
      *
      * @return \Magento\Quote\Model\ShippingAddressAssignment
      * @deprecated 101.0.0
+     * @see \Magento\Quote\Model\ShippingAddressAssignment
      */
     private function getShippingAddressAssignment()
     {

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ public function get($cartId)`
`109`	`109`	`*`
`110`	`110`	`* @return \Magento\Quote\Model\ShippingAddressAssignment`
`111`	`111`	`* @deprecated 101.0.0`
	`112`	`+ * @see \Magento\Quote\Model\ShippingAddressAssignment`
`112`	`113`	`*/`
`113`	`114`	`private function getShippingAddressAssignment()`
`114`	`115`	`{`