// follow up https://github.com/PrestaShop/PrestaShop/commit/7da25f6159cce3067701c4b25f4b1ee82aad1208

Conflicts:

	controllers/admin/AdminTabsController.php