diff options
| author | Rvo (Open ERP) <rvo@tinyerp.co.in> | 2010-09-15 12:28:45 +0530 |
|---|---|---|
| committer | Rvo (Open ERP) <rvo@tinyerp.co.in> | 2010-09-15 12:28:45 +0530 |
| commit | cd26d7bf6b97cde3e745fdfc400b68af8c68298d (patch) | |
| tree | b2c0f3340b8c07fa542663f0f0ca1030f401b703 /addons/document_ftp | |
| parent | 58cfff7027a3537fcb78f7a754d87c19a31299c9 (diff) | |
| parent | edc394a66b975ddd735527b69d723182c13f9d24 (diff) | |
[MERGE]: lp:trunk-dev-addons2
bzr revid: rvo@tinyerp.co.in-20100915065845-dpo6qn1xyx6pjq3c
Diffstat (limited to 'addons/document_ftp')
| -rw-r--r-- | addons/document_ftp/wizard/ftp_configuration_view.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml index 7991f9594ad..bd10cbcc1d7 100644 --- a/addons/document_ftp/wizard/ftp_configuration_view.xml +++ b/addons/document_ftp/wizard/ftp_configuration_view.xml @@ -30,9 +30,13 @@ <group string="res_config_contents" position="replace"> <field name="host"/> </group> +<<<<<<< TREE <xpath expr="//button[@string='Install Modules']" position="attributes"> <attribute name="string">Configure</attribute> </xpath> +======= + <xpath expr="//button[@name='action_skip']" position="replace"/> +>>>>>>> MERGE-SOURCE </data> </field> </record> |