From 7638ceea954c2790b328323657f7bdecbb3f43e8 Mon Sep 17 00:00:00 2001
From: alazo <alain.zosso@webzos.com>
Date: Thu, 16 Aug 2018 18:45:36 +0200
Subject: [PATCH] Update index.html

---
 templates/cms/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/templates/cms/index.html b/templates/cms/index.html
index 5443ade..99f3f7b 100644
--- a/templates/cms/index.html
+++ b/templates/cms/index.html
@@ -40,11 +40,7 @@
 			<td>&nbsp;</td>
 			<td>&nbsp;</td>
 			<td>&nbsp;</td>
-<<<<<<< HEAD
 			<td class="l1 m">{{ M03.url_code }}</td>
-=======
-			<td class="l1 m">{{ M03.url_code|safe }}</td>
->>>>>>> 16e26b8c7b42ee21e911f85996bb7ac0a5d2eec3
 			<td>&nbsp;</td>
 		</tr>
 		<tr>