antadis/toutpratique
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove conflict

Browse Source
This commit is contained in:
ToutPratique 2016-11-22 10:13:35 +01:00
parent 1ba7af822e
commit 5cec889295
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
themes/toutpratique/modules/blockbestsellers/blockbestsellers.tpl
View File

@ -1,8 +1,3 @@
<<<<<<< HEAD
=======
>>>>>>> 395eac04f467677c9d603591df404a7a31d7dc23
<!-- MODULE Block best sellers -->
<div id="best-sellers_block_right" class="block products_block">
<h4 class="title_block">