------------------------------------------------------------
revno: 13218
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Fri 2013-12-13 11:01:25 +0100
message:
minor
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2013-12-13 09:58:21 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2013-12-13 10:01:25 +0000
@@ -842,11 +842,6 @@
conflict = reportMoreThanOneConflict( object );
}
- if ( !SqlView.class.isAssignableFrom( object.getClass() ) )
- {
- conflict = new ImportConflict( "NoOrg", "no no no" );
- }
-
if ( conflict != null )
{
summaryType.getImportConflicts().add( conflict );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
