Merge branch 'marek'

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

diff --git a/mcs/class/System.Web/System.Web.UI/TemplateInstance.cs b/mcs/class/System.Web/System.Web.UI/TemplateInstance.cs
index be3207ac14991c4f931aa9cae16db416949a7c36..6cf743d637e8a3bfe34cb6c37b6baf05f6811f86 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/TemplateInstance.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateInstance.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
@@ -27,12 +27,12 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-namespace System.Web.UI {
-       public enum TemplateInstance {
+namespace System.Web.UI 
+{
+       public enum TemplateInstance 
+       {
                Multiple = 0,
                Single = 1
        } 
 }
-#endif