Resolving merge conflicts

Adyen · Nov 7, 2024 · 15a7e89 · 15a7e89
1 parent 2707735
commit 15a7e89
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 358 deletions.
diff --git a/view/frontend/web/template/payment/boleto-form.html b/view/frontend/web/template/payment/boleto-form.html
diff --git a/view/frontend/web/template/payment/card-vault-form.html b/view/frontend/web/template/payment/card-vault-form.html
diff --git a/view/frontend/web/template/payment/payment-method-vault-form.html b/view/frontend/web/template/payment/payment-method-vault-form.html
diff --git a/view/frontend/web/template/payment/payment-method-vault.html b/view/frontend/web/template/payment/payment-method-vault.html