projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[MERGE] forward port of branch 7.0 up to e2dd18f
[odoo/odoo.git]
/
addons
/
marketing_campaign
/
__openerp__.py
diff --git
a/addons/marketing_campaign/__openerp__.py
b/addons/marketing_campaign/__openerp__.py
index
22ed4ab
..
9728979
100644
(file)
--- a/
addons/marketing_campaign/__openerp__.py
+++ b/
addons/marketing_campaign/__openerp__.py
@@
-59,7
+59,6
@@
input segments, workflow.
'marketing_campaign_view.xml',
'marketing_campaign_data.xml',
'marketing_campaign_workflow.xml',
- 'res_partner_view.xml',
'report/campaign_analysis_view.xml',
'security/marketing_campaign_security.xml',
'security/ir.model.access.csv'