[FIX] website_sale: yet another kdiff3 mistake during fwd-port 57168a9e90066ed6b3d274d5032a20bef342a00f
[FIX] website_sale: yet another kdiff3 mistake during fwd-port 57168a9e90066ed6b3d274d5032a20bef342a00f

bplancher/odoo,sysadminmatmoz/OCB,ygol/odoo,syci/OCB,Elico-Corp/odoo_OCB,sysadminmatmoz/OCB,microcom/odoo,Elico-Corp/odoo_OCB,storm-computers/odoo,syci/OCB,hip-odoo/odoo,bplancher/odoo,stephen144/odoo,storm-computers/odoo,microcom/odoo,laslabs/odoo,optima-ict/odoo,laslabs/odoo,Elico-Corp/odoo_OCB,ygol/odoo,dfang/odoo,stephen144/odoo,storm-computers/odoo,optima-ict/odoo,sysadminmatmoz/OCB,stephen144/odoo,microcom/odoo,sysadminmatmoz/OCB,laslabs/odoo,sysadminmatmoz/OCB,dfang/odoo,ygol/odoo,laslabs/odoo,bplancher/odoo,bplancher/odoo,dfang/odoo,microcom/odoo,hip-odoo/odoo,storm-computers/odoo,hip-odoo/odoo,syci/OCB,ygol/odoo,dfang/odoo,ygol/odoo,storm-computers/odoo,syci/OCB,Elico-Corp/odoo_OCB,sysadminmatmoz/OCB,storm-computers/odoo,optima-ict/odoo,stephen144/odoo,ygol/odoo,dfang/odoo,bplancher/odoo,Elico-Corp/odoo_OCB,optima-ict/odoo,stephen144/odoo,dfang/odoo,ygol/odoo,microcom/odoo,laslabs/odoo,hip-odoo/odoo,hip-odoo/odoo,microcom/odoo,bplancher/odoo,syci/OCB,laslabs/odoo,optima-ict/odoo,hip-odoo/odoo,syci/OCB,Elico-Corp/odoo_OCB,stephen144/odoo,optima-ict/odoo,sysadminmatmoz/OCB