From c6bc872b05a8ecb856fb14d7cb67864c91fe6cee Mon Sep 17 00:00:00 2001 From: CarlNation Date: Mon, 2 Oct 2023 10:33:39 -0400 Subject: [PATCH] CSR-1392 fix merge conflict --- src/layouts/payment-method/payment-method.vue | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index a29047dc2..e00853557 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -27,6 +27,36 @@ :rainDefenseItem="availableRainDefense" vapsTilesCmsName="VapsProductTiles" /> +
+ + + + +
+
+ +
+