From e240abd8a53bbd976adca17d07d183807a770fc0 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 24 Jun 2010 10:05:29 +0530
Subject: [PATCH] Remove conflicts

bzr revid: mra@mra-laptop-20100624043529-ycm1nhj8x20un0jt
---
 addons/account/account_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b686d9e30c7..86499efdc27 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -467,14 +467,13 @@
                     <field name="currency"/>
                     <field name="period_id"/>
                     <group colspan="2" col="3">
-<!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
-<!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
+<!--                        <button name="%(action_view_account_statement_from_invoice)d"
+              string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
                         <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>
                     </group>
                     <newline/>
                     <field name="balance_start"/>
                     <field name="balance_end_real"/>
-                    </group>
                     <notebook colspan="4">
                         <page string="Entry encoding">
                             <field colspan="4" name="line_ids" nolabel="1">