removed the conflict files.

del02433 · del02433 · commit a97432dd73d1 · 2025-04-24T12:25:28.000+05:30
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2014 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/EditComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/EditComment.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2014 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/EditComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/EditComment.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/Sales/Helper/SalesEntityCommentValidator.php b/app/code/Magento/Sales/Helper/SalesEntityCommentValidator.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2011 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/CommentRepository.php b/app/code/Magento/Sales/Model/Order/Creditmemo/CommentRepository.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2017 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php b/app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2011 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/CommentRepository.php b/app/code/Magento/Sales/Model/Order/Invoice/CommentRepository.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2017 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php b/app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2011 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/CommentRepository.php b/app/code/Magento/Sales/Model/Order/Shipment/CommentRepository.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2017 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2011 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo;
 
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2011 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Invoice;
 
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2011 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Shipment;
 
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/EditCommentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/EditCommentTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/EditCommentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/EditCommentTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Helper/SalesEntityCommentValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Helper/SalesEntityCommentValidatorTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Comment/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Comment/ValidatorTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2014 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Comment/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Comment/ValidatorTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2014 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Comment/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Comment/ValidatorTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2014 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Creditmemo/CommentTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Creditmemo/CommentTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2014 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Invoice/CommentTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Invoice/CommentTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2014 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/CommentTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/CommentTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2014 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/ViewModel/Order/Entity/EditCommentCheck.php b/app/code/Magento/Sales/ViewModel/Order/Entity/EditCommentCheck.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml
@@ -3,10 +3,6 @@
 /**
  * Copyright 2011 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml
@@ -3,10 +3,6 @@
 /**
  * Copyright 2013 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml
@@ -3,10 +3,6 @@
 /**
  * Copyright 2011 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
@@ -3,10 +3,6 @@
 /**
  * Copyright 2013 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
@@ -2,10 +2,6 @@
 /**
  * Copyright 2013 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 
 /** @var SecureHtmlRenderer $secureRenderer */
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
@@ -2,10 +2,6 @@
 /**
  * Copyright 2013 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
@@ -2,10 +2,6 @@
 /**
  * Copyright 2013 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2014 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/EditComment.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/EditComment.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EditCommentTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EditCommentTest.php
@@ -2,10 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addcomment.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_addcomment.xml
@@ -3,10 +3,6 @@
 /**
  * Copyright 2011 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml
@@ -3,10 +3,6 @@
 /**
  * Copyright 2013 Adobe
  * All Rights Reserved.
-<<<<<<< Updated upstream
- * ***********************************************************************
-=======
->>>>>>> Stashed changes
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
diff --git a/app/code/Magento/User/Block/User/Edit.php b/app/code/Magento/User/Block/User/Edit.php
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php b/app/code/Magento/User/Controller/Adminhtml/Auth/ResetPasswordPost.php
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php b/app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php
diff --git a/app/code/Magento/User/Helper/ForceSignIn.php b/app/code/Magento/User/Helper/ForceSignIn.php
diff --git a/app/code/Magento/User/Test/Unit/Helper/ForceSignInTest.php b/app/code/Magento/User/Test/Unit/Helper/ForceSignInTest.php
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_info.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_info.less
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoAddCommentTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoAddCommentTest.php
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceAddCommentTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceAddCommentTest.php
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentAddCommentTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentAddCommentTest.php
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
