From 87c67a33bc60ee12816b51bf56d6254b5c3f2a50 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 9 Apr 2013 11:15:16 +0530
Subject: [PATCH] [REMOVE] conflict

bzr revid: fka@tinyerp.com-20130409054516-8wh9d8jybh918i0p
---
 addons/crm/crm_view.xml | 104 ----------------------------------------
 1 file changed, 104 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b8e6f1727f3..63385fa3e17 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -70,110 +70,6 @@
 
         <menuitem action="crm_case_channel_action" id="menu_crm_case_channel" parent="base.menu_crm_config_lead" sequence="4" groups="base.group_no_one"/>
 
-<<<<<<< TREE
-        <!-- Case Sections Form View -->
-
-        <record id="crm_case_section_view_form" model="ir.ui.view">
-            <field name="name">crm.case.section.form</field>
-            <field name="model">crm.case.section</field>
-            <field name="arch" type="xml">
-                <form string="Sales Team" version="7.0">
-                    <group>
-                        <group>
-                            <field name="name" colspan="2"/>
-                            <field name="parent_id"/>
-                            <field name="code"/>
-                        </group>
-
-                        <group>
-                            <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_sale_salesman_all_leads']}"/>
-                            <field name="resource_calendar_id"/>
-                            <field name="active"/>
-                        </group>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Sales Team">
-                           <group>
-                                <field name="alias_id" invisible="1" required="0"/>
-                                <label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                    <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
-                                 </div>
-                                <field name="change_responsible"/>
-                            </group>
-                            <separator string="Team Members"/>
-                            <field name="member_ids" widget="many2many_kanban">
-                                <kanban quick_create="false" create="true">
-                                    <field name="name"/>
-                                    <templates>
-                                        <t t-name="kanban-box">
-                                            <div style="position: relative">
-                                                <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
-                                                <div class="oe_module_vignette">
-                                                    <div class="oe_module_desc">
-                                                        <field name="name"/>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </t>
-                                    </templates>
-                                </kanban>
-                            </field>
-                        </page>
-                        <page string="Stages">
-                            <separator string="Select Stages for this Sales Team"/>
-                            <field name="stage_ids"/>
-                        </page>
-                        <page string="Notes">
-                            <field name="note"/>
-                        </page>
-                    </notebook>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" help="Follow this salesteam to automatically track the events associated to users of this team."/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- Case Sections Tree View -->
-
-        <record id="crm_case_section_view_tree" model="ir.ui.view">
-            <field name="name">crm.case.section.tree</field>
-            <field name="model">crm.case.section</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="Sales Team">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="user_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- Case Sections Action -->
-
-        <record id="crm_case_section_act" model="ir.actions.act_window">
-            <field name="name">Sales Teams</field>
-            <field name="res_model">crm.case.section</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm_case_section_view_tree"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to define a new sales team.
-              </p><p>
-                Use sales team to organize your different salespersons or
-                departments into separate teams. Each team will work in
-                its own list of opportunities.
-              </p>
-            </field>
-        </record>
-
-        <menuitem action="crm_case_section_act"
-            id="menu_crm_case_section_act" sequence="15"
-            parent="base.menu_base_config" groups="base.group_sale_manager"/>
-
-
         <!-- CRM Stage Tree View -->
 
         <record model="ir.ui.view" id="crm_case_stage_tree">