Skip to content

Commit 7ba6279

Browse files
Manjusha.SManjusha.S
authored andcommitted
Resolved conflicts
1 parent 03c0107 commit 7ba6279

File tree

2 files changed

+76
-0
lines changed

2 files changed

+76
-0
lines changed

dev/tests/acceptance/.credentials

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
#magento/tfa/OTP_SHARED_SECRET
2+
magento/MAGENTO_ADMIN_PASSWORD=Admin@123456
3+
#magento/carriers_fedex_account=
4+
#magento/carriers_fedex_meter_number=
5+
#magento/carriers_fedex_key=
6+
#magento/carriers_fedex_password=
7+
8+
#magento/carriers_ups_password=
9+
#magento/carriers_ups_username=
10+
#magento/carriers_ups_access_license_number=
11+
#magento/carriers_ups_shipper_number=
12+
13+
#magento/carriers_usps_userid=
14+
#magento/carriers_usps_password=
15+
16+
#magento/carriers_dhl_id_us=
17+
#magento/carriers_dhl_password_us=
18+
#magento/carriers_dhl_account_us=
19+
20+
#magento/carriers_dhl_id_eu=
21+
#magento/carriers_dhl_password_eu=
22+
#magento/carriers_dhl_account_eu=
23+
24+
25+
#magento/payment_authorizenet_login=
26+
#magento/payment_authorizenet_trans_key=
27+
#magento/payment_authorizenet_trans_md5=
28+
29+
#magento/authorizenet_fraud_review_login=
30+
#magento/authorizenet_fraud_review_trans_key=
31+
#magento/authorizenet_fraud_review_md5=
32+
33+
#magento/braintree_enabled_fraud_merchant_account_id=
34+
#magento/braintree_enabled_fraud_merchant_id=
35+
#magento/braintree_enabled_fraud_public_key=
36+
#magento/braintree_enabled_fraud_private_key=
37+
38+
#magento/braintree_disabled_fraud_merchant_account_id=
39+
#magento/braintree_disabled_fraud_merchant_id=
40+
#magento/braintree_disabled_fraud_public_key=
41+
#magento/braintree_disabled_fraud_private_key=
42+
43+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_business_account=
44+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_username=
45+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_password=
46+
#magento/payment_paypal_group_all_in_one_wpp_usuk_wpp_required_settings_wpp_and_express_checkout_api_signature=
47+
#magento/payment_paypal_express_merchant_id=
48+
49+
#magento/payflow_pro_fraud_protection_enabled_business_account=
50+
#magento/payflow_pro_fraud_protection_enabled_partner=
51+
#magento/payflow_pro_fraud_protection_enabled_user=
52+
#magento/payflow_pro_fraud_protection_enabled_pwd=
53+
#magento/payflow_pro_fraud_protection_enabled_vendor=
54+
55+
#magento/payflow_pro_business_account=
56+
#magento/payflow_pro_partner=
57+
#magento/payflow_pro_user=
58+
#magento/payflow_pro_pwd=
59+
#magento/payflow_pro_vendor=
60+
61+
#magento/payflow_link_business_account_email=
62+
#magento/payflow_link_partner=
63+
#magento/payflow_link_user=
64+
#magento/payflow_link_password=
65+
#magento/payflow_link_vendor=
66+
67+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_business_account=
68+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_api_username=
69+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_api_password=
70+
#magento/payment_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_required_settings_pphs_api_signature=
71+
72+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_business_account=
73+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_username=
74+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_password=
75+
#magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_signature=
76+
4 KB
Binary file not shown.

0 commit comments

Comments
 (0)