Merge pull request #1275 from ranma42/fix-lib64

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

diff --git a/mcs/class/System.Web/System.Web.UI/ConflictOptions.cs b/mcs/class/System.Web/System.Web.UI/ConflictOptions.cs
index e4e868fb8b543c74845f8c8133fe8c06e011a118..448054872e3407a17e9625583601c3a9b3aa82b4 100644 (file)
--- 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