dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10270
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-03-16 22:00:57 +0700
message:
  removed conflicts from import summary page for now
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm


--
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-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 14:59:29 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm	2013-03-16 15:00:57 +0000
@@ -15,7 +15,6 @@
         <td>Imported</td>
         <td>Updated</td>
         <td>Ignored</td>
-        <td>Conflicts</td>
     </tr>
     </thead>
     <tbody>
@@ -25,7 +24,6 @@
             <td>$typeSummary.importCount.imported</td>
             <td>$typeSummary.importCount.updated</td>
             <td>$typeSummary.importCount.ignored</td>
-            <td>$typeSummary.conflicts.size()</td>
         </tr>
         #end
     </tbody>