[FIX] website_sale: fixed remaining TREE tag due to conflict

bzr revid: tde@openerp.com-20131113104333-5ulxae6vbcgc5al6
This commit is contained in:
Thibault Delavallée 2013-11-13 11:43:33 +01:00
parent ac54e05a21
commit 72ff6562b6
1 changed files with 0 additions and 1 deletions

View File

@ -899,7 +899,6 @@
<t t-foreach="payments" t-as="payment">
<div t-att-data-id="payment.id" t-raw="payment._content" class="hidden"/>
</t>
<<<<<<< TREE
</div>
<div class="js_payment_validation mb64" t-if="payment_acquirer_id">