Author: hagity
Date: 2006-08-28 04:05:40 -0400 (Mon, 28 Aug 2006)
New Revision: 64462

Modified:
   trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
Log:
deleted irrelevant marks

Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog 
2006-08-28 07:30:03 UTC (rev 64461)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog 
2006-08-28 08:05:40 UTC (rev 64462)
@@ -19,10 +19,6 @@
        * TreeNodeTest.cs: New test was added
        * TreeViewTest.cs: Test was updated
 
-=======
-=======
-<<<<<<< .mine
-<<<<<<< .mine
 2006-08-10 Hagit Yidov <[EMAIL PROTECTED]>
 
        * ImageMapTest.cs: New test was added
@@ -32,8 +28,6 @@
        * RectangleHotSpot.cs: New test was added
        * PolygonHotSpot.cs: New test was added
 
-=======
-=======
 2006-08-23 Igor Zelmanovich <[EMAIL PROTECTED]>
 
        * MenuTest.cs: added tests 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to