diff options
| author | Josse Colpaert <jco@odoo.com> | 2014-06-17 16:23:44 +0200 |
|---|---|---|
| committer | Josse Colpaert <jco@odoo.com> | 2014-06-17 16:23:44 +0200 |
| commit | 6b63d40145ab0816e8e45626efa86c4891072618 (patch) | |
| tree | c142b846c8e1c41ce87ff7aa598fb6fc3fc51d52 /addons/plugin_thunderbird/plugin_thunderbird.xml | |
| parent | aef4d9b163fd8d985817b3379ff7dccc3b6b92a3 (diff) | |
| parent | 02677579d2171f38b228e13b0edbef09d4e4e4bb (diff) | |
[MERGE] Merge from master and resolve conflict
Diffstat (limited to 'addons/plugin_thunderbird/plugin_thunderbird.xml')
| -rw-r--r-- | addons/plugin_thunderbird/plugin_thunderbird.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index 31fa27a644f..4c435f88398 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -56,7 +56,7 @@ <field name="model">sale.config.settings</field> <field name="inherit_id" ref="base_setup.view_sale_config_settings"/> <field name="arch" type="xml"> - <div name="module_plugin_thunderbird" version="7.0" position="replace"> + <div name="module_plugin_thunderbird" position="replace"> <div> <field name="module_plugin_thunderbird" class="oe_inline"/> <label for="module_plugin_thunderbird"/> |