svn commit: r1589608 - in /ofbiz/branches/release11.04: ./ applications/content/data/MimeTypeData.xml

[jacopoc]

Author: jacopoc
Date: Thu Apr 24 06:47:45 2014
New Revision: 1589608

URL: http://svn.apache.org/r1589608
Log:
Applied fix from trunk for revision: 1589606
===

Fix by Michael Brohl from OFBIZ-5605: Duplicate FileExtension entry for jpg in MimeTypeData.xml


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/applications/content/data/MimeTypeData.xml

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1589606

Modified: ofbiz/branches/release11.04/applications/content/data/MimeTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/content/data/MimeTypeData.xml?rev=1589608&r1=1589607&r2=1589608&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/content/data/MimeTypeData.xml (original)
+++ ofbiz/branches/release11.04/applications/content/data/MimeTypeData.xml Thu Apr 24 06:47:45 2014
@@ -115,7 +115,6 @@ under the License.
     <FileExtension fileExtensionId="css" mimeTypeId="text/css"/>
     <FileExtension fileExtensionId="flv" mimeTypeId="video/x-flv"/>
     <FileExtension fileExtensionId="jpg" mimeTypeId="image/jpeg"/>
-    <FileExtension fileExtensionId="jpg" mimeTypeId="image/jpeg"/>
     <FileExtension fileExtensionId="jpeg" mimeTypeId="image/jpeg"/>
     <FileExtension fileExtensionId="tif" mimeTypeId="image/tiff"/>
     <FileExtension fileExtensionId="tiff" mimeTypeId="image/tiff"/>