Merge pull request #439 from mono-soc-2012/garyb/iconfix

[mono.git] / mcs / class / System.EnterpriseServices / System.EnterpriseServices / InheritanceOption.cs

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs
index 478554c82357ae1a838fe902c5ab16057c5d7404..7cadf861662291954c79ee842caa2d75a8d82063 100644 (file)
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Serializable]\r
        [ComVisible(false)]\r
        public enum InheritanceOption {\r
@@ -39,5 +38,4 @@ namespace System.EnterpriseServices {
                Inherit,\r
                Ignore\r
        }\r
-#endif\r
 }\r