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

[IMP] event:- removed conflicts 

bzr revid: mtr@tinyerp.com-20120305105056-ohmobei5pwt4v0ux
This commit is contained in:
Meera Trambadia (OpenERP) 2012-03-05 16:20:56 +05:30
parent b369760376
commit 768b87a5c0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/event/event_view.xml
View File

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