Fix merge conflicts

This commit is contained in:
Emili Castells Guasch 2023-03-29 13:03:20 +02:00
commit 1ed8f23efd
51 changed files with 1411 additions and 306 deletions

View file

@ -1,8 +1,8 @@
PPCP_E2E_WP_DIR=${ROOT_DIR}/.ddev/wordpress
BASEURL="https://woocommerce-paypal-payments.ddev.site"
AUTHORIZATION="Bearer ABC123"
PRODUCT_URL="/product/prod"
WP_MERCHANT_USER="admin"
WP_MERCHANT_PASSWORD="admin"
@ -11,6 +11,7 @@ MERCHANT_PASSWORD="merchant"
WP_CUSTOMER_USER="customer"
WP_CUSTOMER_PASSWORD="password"
CUSTOMER_EMAIL="customer@example.com"
CUSTOMER_PASSWORD="password"
CUSTOMER_FIRST_NAME="first"