summaryrefslogtreecommitdiff
path: root/addons/document/document_data.xml
diff options
context:
space:
mode:
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-06-28 13:53:32 +0200
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-06-28 13:53:32 +0200
commit8c225089e56b7c0732918ce5eb4962ad71b9e6d8 (patch)
treec2a4eb1a1543461ba9d9dd905149a26b36160788 /addons/document/document_data.xml
parente09e0abbdea89844e919df81223090f4eebe0dbf (diff)
parenta6e3d4bf0029d879e008414090d54499ffe358f4 (diff)
[MERGE] merged main trunk branch
bzr revid: qdp-launchpad@openerp.com-20120628115332-6leye61nr42a2umx
Diffstat (limited to 'addons/document/document_data.xml')
-rw-r--r--addons/document/document_data.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index ac7a174b05f..a7bc98de6f3 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -104,6 +104,5 @@
<!-- After we have setup the root directory, migrate the attachments
to point to that. -->
<function model="ir.attachment" name="_attach_parent_id"/>
-
</data>
</openerp>