diff --git a/templates/cms/index.html b/templates/cms/index.html index 99f3f7b..5443ade 100644 --- a/templates/cms/index.html +++ b/templates/cms/index.html @@ -40,7 +40,11 @@       +<<<<<<< HEAD {{ M03.url_code }} +======= + {{ M03.url_code|safe }} +>>>>>>> 16e26b8c7b42ee21e911f85996bb7ac0a5d2eec3