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 d52729cf7cadbda99ceedc91aecc702bd717eae2..7cadf861662291954c79ee842caa2d75a8d82063 100644 (file)
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs
@@ -4,34 +4,33 @@
 //\r
 // Copyright (C) 2004 Novell, Inc.\r
 //\r
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+\r
+//\r
+// Permission is hereby granted, free of charge, to any person obtaining\r
+// a copy of this software and associated documentation files (the\r
+// "Software"), to deal in the Software without restriction, including\r
+// without limitation the rights to use, copy, modify, merge, publish,\r
+// distribute, sublicense, and/or sell copies of the Software, and to\r
+// permit persons to whom the Software is furnished to do so, subject to\r
+// the following conditions:\r
+// \r
+// The above copyright notice and this permission notice shall be\r
+// included in all copies or substantial portions of the Software.\r
+// \r
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+//\r
 \r
 using System;\r
 using System.Runtime.InteropServices;\r
 \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