Skip to content

Commit 1202a8d

Browse files
ACQE-8000: Unskip StorefrontBundleCheckBoxOptionValidationTest
- Fixed copyright issue
1 parent 7998d8d commit 1202a8d

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AssertStorefrontBundleValidationMessageActionGroup.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
<<<<<<< HEAD
43
/**
54
* Copyright 2020 Adobe
65
* All Rights Reserved.
7-
=======
8-
/************************************************************************
9-
*
10-
* ADOBE CONFIDENTIAL
11-
* ___________________
12-
*
13-
* Copyright 2025 Adobe
14-
* All Rights Reserved.
15-
*
16-
* NOTICE: All information contained herein is, and remains
17-
* the property of Adobe and its suppliers, if any. The intellectual
18-
* and technical concepts contained herein are proprietary to Adobe
19-
* and its suppliers and are protected by all applicable intellectual
20-
* property laws, including trade secret and copyright laws.
21-
* Dissemination of this information or reproduction of this material
22-
* is strictly forbidden unless prior written permission is obtained
23-
* from Adobe.
24-
* ************************************************************************
25-
>>>>>>> ACQE-8000-1
266
*/
277
-->
288

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCheckBoxOptionValidationTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* All Rights Reserved.
66
*/
77
-->
8+
89
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
910
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1011
<test name="StorefrontBundleCheckBoxOptionValidationTest">

0 commit comments

Comments
 (0)