// Remove JS override since it's the same file as module (cf https://github.com/PrestaShop/blockwishlist/commit/9f006b99505e2164e86d66bb03aefa5598bd9120)
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6