Author: andrews
Date: 2006-11-29 07:14:23 -0500 (Wed, 29 Nov 2006)
New Revision: 68658
Modified:
trunk/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx
Log:
fix merge error
Modified:
trunk/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx
===================================================================
---
trunk/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx
2006-11-29 11:50:33 UTC (rev 68657)
+++
trunk/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx
2006-11-29 12:14:23 UTC (rev 68658)
@@ -1,2 +1 @@
<%@ WebHandler Class="MonoTests.SystemWeb.Framework.MyHandler" Language="C#" %>
-<%@ WebHandler Class="MonoTests.SystemWeb.Framework.MyHandler" Language="C#" %>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
