Merge pull request #1500 from criteo-forks/criteo

[mono.git] / mcs / class / System.Web / System.Web.UI / PropertyConverter.cs

diff --git a/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs b/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs
index 0a47030dfe824a6a659caad4a658ad7b7f917655..fbd974056ddba8685493a155040c4f925e5c1cd5 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs
+++ b/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs
@@ -24,7 +24,7 @@
 // Authors:
 //     Jackson Harper (jackson@ximian.com)
 //
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005-2010 Novell, Inc (http://www.novell.com)
 
 using System.Reflection;
 using System.ComponentModel;
@@ -34,16 +34,8 @@ namespace System.Web.UI {
 
        // CAS - no InheritanceDemand here as the class is sealed
        [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-#if NET_2_0
-       public static class PropertyConverter {
-#else
-       public sealed class PropertyConverter {
-
-               PropertyConverter ()
-               {
-                       // no instantiation for you
-               }
-#endif
+       public static class PropertyConverter
+       {
                public static object EnumFromString (Type enumType, string value)
                {
                        object res = null;