Merge branch 'marek'

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

diff --git a/mcs/class/System.Web/System.Web.UI/Triplet.cs b/mcs/class/System.Web/System.Web.UI/Triplet.cs
index f27de1fd5ccdf50463c0e3c7e7e1b20738d34812..7175b6cda730fb214d0cb5ee8aab4982ce89ec48 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Triplet.cs
+++ b/mcs/class/System.Web/System.Web.UI/Triplet.cs
@@ -4,7 +4,7 @@
 // Duncan Mak  (duncan@ximian.com)
 //
 // (C) Ximian, Inc.
-// 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
@@ -32,13 +32,9 @@ namespace System.Web.UI {
 
        // CAS
        [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-#if NET_2_0
        [Serializable]
-       public sealed class Triplet {
-#else
-       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       public class Triplet {
-#endif
+       public sealed class Triplet
+       {
                public object First;
                public object Second;
                public object Third;