Skip to content

Commit 0011795

Browse files
committed
Merge branch '2.4-develop' into MC-14884
2 parents 7fdb6c8 + 4040a32 commit 0011795

File tree

446 files changed

+341
-35706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

446 files changed

+341
-35706
lines changed

app/code/Magento/Analytics/etc/di.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,7 @@
163163
<item name="27" xsi:type="string">payment/cashondelivery/active</item>
164164
<item name="28" xsi:type="string">payment/paypal_billing_agreement/title</item>
165165
<item name="29" xsi:type="string">payment/paypal_billing_agreement/active</item>
166-
<item name="30" xsi:type="string">payment/braintree/title</item>
167-
<item name="31" xsi:type="string">payment/braintree/active</item>
168-
<item name="32" xsi:type="string">payment/braintree_paypal/title</item>
169-
<item name="33" xsi:type="string">payment/braintree_paypal/active</item>
170-
<item name="34" xsi:type="string">analytics/general/vertical</item>
166+
<item name="30" xsi:type="string">analytics/general/vertical</item>
171167
</argument>
172168
</arguments>
173169
</type>

app/code/Magento/Braintree/Block/Adminhtml/Form/Field/CcTypes.php

Lines changed: 0 additions & 63 deletions
This file was deleted.

app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php

Lines changed: 0 additions & 58 deletions
This file was deleted.

app/code/Magento/Braintree/Block/Adminhtml/Form/Field/CountryCreditCard.php

Lines changed: 0 additions & 106 deletions
This file was deleted.

app/code/Magento/Braintree/Block/Customer/CardRenderer.php

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)