projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'marek'
[mono.git]
/
mcs
/
class
/
System.Web
/
System.Web.UI
/
OutputCacheParameters.cs
diff --git
a/mcs/class/System.Web/System.Web.UI/OutputCacheParameters.cs
b/mcs/class/System.Web/System.Web.UI/OutputCacheParameters.cs
index 48cdbfcfc01cb8fb699885071ff5f32d5ea9050a..c9174f5b1acbb8d702f892af8cda6a0c157abd47 100644
(file)
--- a/
mcs/class/System.Web/System.Web.UI/OutputCacheParameters.cs
+++ b/
mcs/class/System.Web/System.Web.UI/OutputCacheParameters.cs
@@
-23,8
+23,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.ComponentModel;
using System.Security.Permissions;
@@
-123,5
+121,3
@@
namespace System.Web.UI
#endregion
}
}
-
-#endif