=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm 2013-03-16 14:59:29 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm 2013-03-21 09:15:24 +0000 @@ -40,4 +40,4 @@ -
+ === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm 2013-03-16 15:00:57 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm 2013-03-21 09:15:24 +0000 @@ -1,6 +1,5 @@$i18n.getString( "type" ) | +$i18n.getString( "element" ) | +$i18n.getString( "description" ) | +
---|---|---|
${typeSummary.type} | +${conflict.object} | +$encoder.htmlEncode( $conflict.value ) | +
$i18n.getString( "no_conflicts_found" )
+#end