From c66a403d87734d403442dd936a15cf37746cc5e2 Mon Sep 17 00:00:00 2001 From: MarijusCoding Date: Thu, 3 Oct 2024 09:02:21 +0300 Subject: [PATCH] revert --- views/templates/front/credit_cards.tpl | 4 ++++ views/templates/front/credit_cards_16.tpl | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/views/templates/front/credit_cards.tpl b/views/templates/front/credit_cards.tpl index 16083a4b..887fb900 100755 --- a/views/templates/front/credit_cards.tpl +++ b/views/templates/front/credit_cards.tpl @@ -51,7 +51,11 @@ {foreach $rows as $row} +<<<<<<< HEAD {$row|cleanHtml nofilter} +======= + {$row nofilter|escape:'htmlall':'UTF-8'} +>>>>>>> parent of 7e197ab (Merge pull request #190 from Invertus/SL-234/my-account-override) {/foreach} diff --git a/views/templates/front/credit_cards_16.tpl b/views/templates/front/credit_cards_16.tpl index af1140bf..8fac03a9 100755 --- a/views/templates/front/credit_cards_16.tpl +++ b/views/templates/front/credit_cards_16.tpl @@ -53,7 +53,11 @@ {foreach $rows as $row} +<<<<<<< HEAD {$row|cleanHtml nofilter} +======= + {$row nofilter|escape:'htmlall':'UTF-8'} +>>>>>>> parent of 7e197ab (Merge pull request #190 from Invertus/SL-234/my-account-override) {/foreach}