Merge branch 'cecil-light'

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

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlEmptyTagControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlEmptyTagControlBuilder.cs
index 48c72a0b49bdfc7d5d6bd75ed2314fbe6690d08f..5e5725d4e7f4dfd2bce644718bd346c052c8295c 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlEmptyTagControlBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlEmptyTagControlBuilder.cs
@@ -4,7 +4,7 @@
 // Author:
 //     Sebastien Pouliot  <sebastien@ximian.com>
 //
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005-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,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System.Security.Permissions;
 
 namespace System.Web.UI.HtmlControls {
@@ -35,8 +33,8 @@ namespace System.Web.UI.HtmlControls {
        // CAS
        [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       public sealed class HtmlEmptyTagControlBuilder : ControlBuilder {
-
+       public sealed class HtmlEmptyTagControlBuilder : ControlBuilder
+       {
                public HtmlEmptyTagControlBuilder ()
                {
                }
@@ -49,4 +47,3 @@ namespace System.Web.UI.HtmlControls {
        }
 }
 
-#endif