From 768b87a5c0977d4f7dcd27c24cdb05c78c0cd6fd Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Mon, 5 Mar 2012 16:20:56 +0530
Subject: [PATCH] [IMP] event:- removed conflicts

bzr revid: mtr@tinyerp.com-20120305105056-ohmobei5pwt4v0ux
---
 addons/event/event_view.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 517fdc7070c..9936624c243 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -5,12 +5,9 @@
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
 
-<<<<<<< TREE
-        <menuitem name="Events" id="base.menu_event_main" parent="base.marketing_menu" />
-        <menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
-=======
-        <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
->>>>>>> MERGE-SOURCE
+
+        <menuitem  name="Events" id="event_main_menu"/>
+        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
     <!-- EVENTS  -->