From 72ff6562b6cc8ed4d3c61c2ca046e3269d85786e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Nov 2013 11:43:33 +0100
Subject: [PATCH] [FIX] website_sale: fixed remaining TREE tag due to conflict

bzr revid: tde@openerp.com-20131113104333-5ulxae6vbcgc5al6
---
 addons/website_sale/views/website_sale.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 2222485d35d..146e1c28600 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -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">