Hmm, conflict :-(
The line
<t t-set="fileupload_style" t-translation="off">width: 83px;</t>
became
<t t-set="fileupload_style" t-translation="off">overflow-x: hidden</t>
Id doesn't seem to be related to your fix though (changed in revisions
3745.2.424 and 3745.2.426)
Can you resolve the conflict?
--
https://code.launchpad.net/~stefan-therp/ocb-web/7.0-lp1293085-binary_field_widget_in_list_views/+merge/211489
Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-web.
--
Mailing list: https://launchpad.net/~openerp-community-reviewer
Post to : openerp-community-reviewer@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community-reviewer
More help : https://help.launchpad.net/ListHelp
