From f2cc6004f90efa4d3c9f70db8b93945ca0c2595e Mon Sep 17 00:00:00 2001 From: joncham Date: Tue, 5 Dec 2006 16:33:41 +0000 Subject: [PATCH] Remove conflict line. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@69053 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index 8669322770..bd8ee916b4 100644 --- a/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -28,7 +28,6 @@ * Control.cs: Make the Console.WriteLine in WndProc write more info. ->>>>>>> .r69051 2006-12-05 Chris Toshok * ToolStripManager.cs, ToolStripButton.cs, -- 2.11.4.GIT