[FIX] Fixed conflicts in kanban.js. Thanks to VME.
[FIX] Fixed conflicts in kanban.js. Thanks to VME.

havt/openerp-web,akretion/openerp-web,havt/openerp-web,akretion/openerp-web,havt/openerp-web,akretion/openerp-web,havt/openerp-web,havt/openerp-web