Merge branch 'master' of github.com:mono/mono

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

diff --git a/mcs/class/System.Web/System.Web.UI/IControlBuilderAccessor.cs b/mcs/class/System.Web/System.Web.UI/IControlBuilderAccessor.cs
index 1652c097e21bda8d725cb220d8ad5229c5b2ff65..cfd9a1dd534d52bf8ed2f2e62f1df64598092a98 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/IControlBuilderAccessor.cs
+++ b/mcs/class/System.Web/System.Web.UI/IControlBuilderAccessor.cs
@@ -4,7 +4,7 @@
 // Authors:
 //      Sanjay Gupta (gsanjay@novell.com)
 //
-// (C) 2004 Novell, Inc (http://www.novell.com)
+// (C) 2004-2010 Novell, Inc (http://www.novell.com)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-
-#if NET_2_0
 using System;
 
 namespace System.Web.UI
@@ -38,5 +36,4 @@ namespace System.Web.UI
                ControlBuilder ControlBuilder { get; }
        }
 }
-#endif