summaryrefslogtreecommitdiff
path: root/addons/document_ftp/wizard/ftp_configuration_view.xml
diff options
context:
space:
mode:
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-06-29 14:36:18 +0200
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-06-29 14:36:18 +0200
commit6fe94bd4bc076ad659dffe453c7b057e9340b54d (patch)
treed673f7a2b25ec1f01307c45f081ed8c9fe27babf /addons/document_ftp/wizard/ftp_configuration_view.xml
parenta642b36339ac6628b1a937bbf0d2750cc14fcdd5 (diff)
parent37601079a987b0b20f22fff8963d22b1440b78b4 (diff)
[MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
Diffstat (limited to 'addons/document_ftp/wizard/ftp_configuration_view.xml')
-rw-r--r--addons/document_ftp/wizard/ftp_configuration_view.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index c4140e4511d..ed52a730023 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -22,7 +22,6 @@
<label string="Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."/>
<field name="host"/>
</group>
- <xpath expr="//button[@name='action_skip']" position="replace"/>
</data>
</field>
</record>