From 798c81a9530746bb2f748c9e4b28882bc2a66add Mon Sep 17 00:00:00 2001 From: engcom-Echo Date: Wed, 30 Sep 2020 16:44:18 +0300 Subject: [PATCH] resolved conflict --- .../StorefrontCartPriceRuleForBundleProductTest.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleForBundleProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleForBundleProductTest.xml index 3ddddc819df62..c5f4e8a07f622 100644 --- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleForBundleProductTest.xml +++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleForBundleProductTest.xml @@ -76,9 +76,7 @@ - - - + @@ -105,9 +103,7 @@ - - - + @@ -142,8 +138,8 @@ - - + +