Merge pull request #495 from woocommerce/fix-521-merge-conflict

Fix #464 merge conflict
This commit is contained in:
Emili Castells 2022-02-15 11:43:08 +01:00 committed by GitHub
commit bff0f841b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1984,7 +1984,7 @@ return array(
),
'class' => array(),
'input_class' => array( 'wc-enhanced-select' ),
'default' => $container->get( 'api.shop.is-psd2-country' ) ? '3D_SECURE' : 'NO_3D_SECURE',
'default' => $container->get( 'api.shop.is-psd2-country' ) ? 'SCA_WHEN_REQUIRED' : 'NO_3D_SECURE',
'desc_tip' => true,
'options' => array(
'NO_3D_SECURE' => __( 'No 3D Secure (transaction will be denied if 3D Secure is required)', 'woocommerce-paypal-payments' ),