Removed the conflict

bzr revid: jni@tinyerp.com-20101011103856-dvfjcx75kpntp591
2010-10-11 16:08:56 +05:30
parent eaa031075c
commit ebb0595c54
1 changed files with 1 additions and 3 deletions
@@ -1705,9 +1705,7 @@
                        <field name="location_id"/>
                        <field name="location_dest_id"/>
                    </group>
-<<<<<<< TREE
-            <field name="name">Delivery Products vs Planned</field>
-=======
+
                    <group colspan="2" col="2">
                        <separator string="Dates &amp; Priority" colspan="2" />
                        <field name="date" groups="base.group_extended"/>