Merge branch 'marek'

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

diff --git a/mcs/class/System.Web/System.Web.UI/FilterableAttribute.cs b/mcs/class/System.Web/System.Web.UI/FilterableAttribute.cs
index 2626d9e4de7c2411dbc2ba3c953467047e081f0e..afbfb3bb68a937a6efa599a0fd6609026df5866d 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/FilterableAttribute.cs
+++ b/mcs/class/System.Web/System.Web.UI/FilterableAttribute.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)
 //
 
 //
@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
 using System;
 using System.ComponentModel;
 
@@ -84,7 +83,7 @@ namespace System.Web.UI {
                                        if (attrib is FilterableAttribute)
                                                return true;
                        }
-                       return false;                   
+                       return false;
                }
 
                public static bool IsTypeFilterable (Type type)
@@ -95,8 +94,7 @@ namespace System.Web.UI {
                                        if (attrib is FilterableAttribute)
                                                return true;
                        }
-                       return false;                   
+                       return false;
                }
        }
 }
-#endif