Author: miguel
Date: 2006-11-28 19:10:46 -0500 (Tue, 28 Nov 2006)
New Revision: 68630
Modified:
trunk/mcs/class/System.Data/System.Data/DataRowCollection.cs
Log:
Fix merge problem
Modified: trunk/mcs/class/System.Data/System.Data/DataRowCollection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data/DataRowCollection.cs
2006-11-28 23:48:19 UTC (rev 68629)
+++ trunk/mcs/class/System.Data/System.Data/DataRowCollection.cs
2006-11-29 00:10:46 UTC (rev 68630)
@@ -392,12 +392,5 @@
ListChanged (sender, args);
}
-#if NET_2_0
- public override int Count {
- get {
- return base.Count;
- }
- }
-#endif
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
