fix conflict

This commit is contained in:
Marion Muszynski 2016-06-07 14:51:10 +02:00
parent 5a7e53a116
commit 1c2c54f808

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
<div class="overlay_bbb"></div> <div class="overlay_bbb"></div>
<div class="box_add_to_cart"> <div class="box_add_to_cart">