resolved conflicts

Manjusha.S · Manjusha.S · commit 57d28be2c9b5 · 2022-05-20T15:35:20.000+05:30
diff --git a/app/code/Magento/Multishipping/Model/Cart/MultishippingClearItemAddress.php b/app/code/Magento/Multishipping/Model/Cart/MultishippingClearItemAddress.php
@@ -143,4 +143,4 @@ private function isDisableMultishippingRequired(RequestInterface $request, Quote
     {
         return $request->getActionName() !== "add" && $quote->getIsMultiShipping();
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -143,4 +143,4 @@ private function isDisableMultishippingRequired(RequestInterface $request, Quote`
`143`	`143`	`{`
`144`	`144`	`return $request->getActionName() !== "add" && $quote->getIsMultiShipping();`
`145`	`145`	`}`
`146`		`-}`
	`146`	`+}`