From 37b97c00a40aa4bca5b82ff348e3a987b6eddcad Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Thu, 23 Oct 2008 16:40:43 +0530
Subject: [PATCH] PicklingError: Can't pickle <class 'etree.XMLSyntaxError'>:
 import of module etree failed

bzr revid: patelamit2003@gmail.com-20081023111043-nnsbbwqkpq0z7l52
---
 addons/account/account_wizard.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 70d63123a36..525fa46607a 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -89,13 +89,13 @@
         <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
 
-<<<<<<< TREE
+
         <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Print Central journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_central_journal" parent="account.menu_generic_report" type="wizard" />
-=======
+
         <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Central Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_cetral_journal" parent="account.menu_generic_report" type="wizard" />
->>>>>>> MERGE-SOURCE
+
 
         <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />