// Fix merge

This commit is contained in:
Jerome Nadaud
2013-10-25 14:33:29 +02:00
parent 08baa71a05
commit 81482df1e5
@@ -457,7 +457,8 @@ class AdminCategoriesControllerCore extends AdminController
'image' => $image_url ? $image_url : false,
'size' => $image_size,
'delete_url' => self::$currentIndex.'&'.$this->identifier.'='.$this->id.'&token='.$this->token.'&deleteImage=1',
'hint' => $this->l('Upload a category logo from your computer.')
'hint' => $this->l('Upload a category logo from your computer.'),
'col' => 4
),
array(
'type' => 'text',