X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI%2FConflictOptions.cs;h=448054872e3407a17e9625583601c3a9b3aa82b4;hb=879970ea20a49e63a5413adec014754b30a53e03;hp=e4e868fb8b543c74845f8c8133fe8c06e011a118;hpb=75df74a96c33af7a99e16e4281272f1b67334a48;p=mono.git

diff --git a/mcs/class/System.Web/System.Web.UI/ConflictOptions.cs b/mcs/class/System.Web/System.Web.UI/ConflictOptions.cs
index e4e868fb8b5..448054872e3 100644
--- a/mcs/class/System.Web/System.Web.UI/ConflictOptions.cs
+++ b/mcs/class/System.Web/System.Web.UI/ConflictOptions.cs
@@ -4,7 +4,7 @@
 // Authors:
 //	Sanjay Gupta (gsanjay@novell.com)
 //
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-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,12 +26,10 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 namespace System.Web.UI {
 	public enum ConflictOptions {
 		OverwriteChanges = 0,
-		CompareAllValues = 1		
+		CompareAllValues = 1
 	}
 }
-#endif