fix merge error
authorAndrew Skiba <andrews@mono-cvs.ximian.com>
Wed, 29 Nov 2006 12:14:23 +0000 (12:14 -0000)
committerAndrew Skiba <andrews@mono-cvs.ximian.com>
Wed, 29 Nov 2006 12:14:23 +0000 (12:14 -0000)
commit3cb682c32ebbfb686a9fa7fb1135ee4ffdd1f378
treea6d406180bab3eaf39c66d83f7efe61df8bf63c5
parent3c5b0e338e9ff9b0e87fda72f340cffc3f960844
fix merge error

svn path=/trunk/mcs/; revision=68658
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx