Author: joncham
Date: 2006-12-05 11:33:41 -0500 (Tue, 05 Dec 2006)
New Revision: 69053
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
Log:
Remove conflict line.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-05 16:31:37 UTC (rev 69052)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-05 16:33:41 UTC (rev 69053)
@@ -28,7 +28,6 @@
* Control.cs: Make the Console.WriteLine in WndProc
write more info.
->>>>>>> .r69051
2006-12-05 Chris Toshok <[EMAIL PROTECTED]>
* ToolStripManager.cs, ToolStripButton.cs,
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
