Merge branch '2.4-develop' into ACQE-5651-functional-mainline

magento-devops-queue-mgr-svc · web-flow · commit db645f1c3962 · 2023-11-06T21:37:41.000+05:30
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
@@ -1,10 +1,9 @@
 <?php
-/**
+/************************************************************************
+ *
  * Copyright 2023 Adobe
  * All Rights Reserved.
  *
- *  ADOBE CONFIDENTIAL
- *
  * NOTICE: All information contained herein is, and remains
  * the property of Adobe and its suppliers, if any. The intellectual
  * and technical concepts contained herein are proprietary to Adobe
@@ -13,6 +12,7 @@
  * Dissemination of this information or reproduction of this material
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe.
+ * ***********************************************************************
  */
 
 namespace Magento\Fedex\Model;
diff --git a/app/code/Magento/Fedex/Model/Source/PickupType.php b/app/code/Magento/Fedex/Model/Source/PickupType.php
@@ -1,8 +1,5 @@
 <?php
 /************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
  *
  * Copyright 2023 Adobe
  * All Rights Reserved.
diff --git a/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
@@ -1,10 +1,9 @@
 <?php
-/**
+/************************************************************************
+ *
  * Copyright 2023 Adobe
  * All Rights Reserved.
  *
- *  ADOBE CONFIDENTIAL
- *
  * NOTICE: All information contained herein is, and remains
  * the property of Adobe and its suppliers, if any. The intellectual
  * and technical concepts contained herein are proprietary to Adobe
@@ -13,6 +12,7 @@
  * Dissemination of this information or reproduction of this material
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe.
+ * ***********************************************************************
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/Fedex/etc/adminhtml/system.xml b/app/code/Magento/Fedex/etc/adminhtml/system.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--
 /************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
  *
  * Copyright 2014 Adobe
  * All Rights Reserved.
diff --git a/app/code/Magento/Fedex/etc/config.xml b/app/code/Magento/Fedex/etc/config.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!--
 /************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
  *
  * Copyright 2014 Adobe
  * All Rights Reserved.

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`<?php`
`2`	`2`	`/************************************************************************`
`3`		`- *`
`4`		`- * ADOBE CONFIDENTIAL`
`5`		`- * ___________________`
`6`	`3`	`*`
`7`	`4`	`* Copyright 2023 Adobe`
`8`	`5`	`* All Rights Reserved.`