OLD 7.0 2015 03 04

Conflict:

diff --cc addons/analytic/analytic_view.xml
index 28ecddc,8c3f959..0000000
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@@ -29,7 -29,7 +29,11 @@@
                                  <field name="type" invisible="context.get('default_type', False)"/>
                                  <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view',
                                  <field name="code"/>
++<<<<<<< HEAD
 +                                <field name="parent_id" on_change="on_change_parent(parent_id)"/>
++=======
+                                 <field name="parent_id" on_change="on_change_parent(parent_id)" />
++>>>>>>> odoo/7.0
                                  <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&g
                              </group>
                          </group>

resolved by

git checkout --theirs addons/analytic/analytic_view.xml

Committed as https://github.com/OCA/OCB/commit/44a991a by @hbrunn