Fix merge conflicts

This commit is contained in:
Emili Castells Guasch 2023-05-16 12:44:14 +02:00
commit 3c0e807758
55 changed files with 5170 additions and 202 deletions

View file

@ -2,7 +2,16 @@ PPCP_E2E_WP_DIR=${ROOT_DIR}/.ddev/wordpress
BASEURL="https://woocommerce-paypal-payments.ddev.site"
AUTHORIZATION="Bearer ABC123"
CHECKOUT_URL="/checkout"
CHECKOUT_PAGE_ID=7
CART_URL="/cart"
BLOCK_CHECKOUT_URL="/checkout-block"
BLOCK_CHECKOUT_PAGE_ID=22
BLOCK_CART_URL="/cart-block"
PRODUCT_URL="/product/prod"
PRODUCT_ID=123
WP_MERCHANT_USER="admin"
WP_MERCHANT_PASSWORD="admin"