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

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

diff --git a/mcs/class/System.Web/System.Web.UI/MasterPageControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/MasterPageControlBuilder.cs
index 615b04d0fd0f26fa5f4da7d29f35330b1637b755..d9f4bb4fee8abad0d7fb35fc071200b273675b1b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/MasterPageControlBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/MasterPageControlBuilder.cs
@@ -4,7 +4,7 @@
 // Authors:
 //   Chris Toshok (toshok@ximian.com)
 //
-// (C) 2006 Novell, Inc (http://www.novell.com)
+// (C) 2006-2010 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -26,13 +26,10 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-namespace System.Web.UI {
-
+namespace System.Web.UI 
+{
        public class MasterPageControlBuilder : UserControlControlBuilder
        {
        }
 
 }
-#endif