Author: mhabersack
Date: 2007-02-26 19:11:53 -0500 (Mon, 26 Feb 2007)
New Revision: 73452

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
Log:
Remove misplaced line

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-02-27 00:06:04 UTC (rev 73451)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-02-27 00:11:53 UTC (rev 73452)
@@ -20,7 +20,6 @@
        considers FormsAuthentication.ReturnUrl only if is placed in 
        the login page defined in web.config. 
 
->>>>>>> .r73450
 2007-02-23  Marek Habersack  <[EMAIL PROTECTED]>
 
        * ObjectDataSourceView.cs: Fix saving/restoring the view state.

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

Reply via email to