From 5cec8892952022d077a218ad0f3a50aad51e9cbd Mon Sep 17 00:00:00 2001
From: ToutPratique <toutpratique@antadis.com>
Date: Tue, 22 Nov 2016 10:13:35 +0100
Subject: [PATCH] remove conflict

---
 .../modules/blockbestsellers/blockbestsellers.tpl            | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/themes/toutpratique/modules/blockbestsellers/blockbestsellers.tpl b/themes/toutpratique/modules/blockbestsellers/blockbestsellers.tpl
index bbb8f48b..0c9d1cc0 100644
--- a/themes/toutpratique/modules/blockbestsellers/blockbestsellers.tpl
+++ b/themes/toutpratique/modules/blockbestsellers/blockbestsellers.tpl
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 395eac04f467677c9d603591df404a7a31d7dc23
 <!-- MODULE Block best sellers -->
 <div id="best-sellers_block_right" class="block products_block">
 	<h4 class="title_block">