fix conflict

2016-06-07 14:51:10 +02:00 · 2016-06-07 14:51:10 +02:00 · 1c2c54f808
commit 1c2c54f808
parent 5a7e53a116
1 changed files with 0 additions and 1 deletions
--- a/themes/site_mobile/product-add_to_cart.tpl
+++ b/themes/site_mobile/product-add_to_cart.tpl
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <div class="overlay_bbb"></div>

 <div class="box_add_to_cart">