"Applied fix from trunk for revision: 1646984" Conflicts in DataResourceForms.xml handled by hand
------------------------------------------------------------------------
r1646984 | ashish | 2014-12-20 15:22:50 +0100 (sam. 20 déc. 2014) | 2 lignes

Applied patch from jira issue OFBIZ-4946 - Getting error when uploading a file after creating a data resource.
Thanks Ashish Ambulkar for creating the issue. Thanks Arun, Jacques for providing the patch.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1647095 13f79535-47bb-0310-9956-ffa450edef68