odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] confliction soved from project todo 

bzr revid: han@tinyerp.com-20110829065346-mpz8hmh122dvcjqb
This commit is contained in:
Hardik Ansodariy (OpenERP) 2011-08-29 12:23:46 +05:30
parent f181077421
commit 6eb0ddca6e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/project/project_installer.xml
View File

@ -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>