From 6eb0ddca6e4e24471b482065ec9850f213e633a0 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Mon, 29 Aug 2011 12:23:46 +0530
Subject: [PATCH] [IMP] confliction soved from project todo

bzr revid: han@tinyerp.com-20110829065346-mpz8hmh122dvcjqb
---
 addons/project/project_installer.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 32e162b8ed6..6349ea72340 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -10,13 +10,12 @@
           <data>
           <xpath expr="//group[@name='project']" position="replace">
             <newline/>
-<<<<<<< TREE
+            <group>
             <separator string="Methodologies" colspan="4"/>
             <field name="project_scrum"/>
             <field name="project_gtd"/>
             <field name="project_todo"/>
           </group>
-=======
             <separator  string="Project Management Features" colspan="4" />
             <field name="project_issue" />
             <field name="project_long_term" />
@@ -26,7 +25,6 @@
             <field name="project_scrum" />
             <field name="project_gtd" />
           </xpath>
->>>>>>> MERGE-SOURCE
         </data>
       </field>
     </record>