Drop of Mainsoft.System.Data

[mono.git] / mcs / class / System.Data / System.Data / ConflictOptions.cs

diff --git a/mcs/class/System.Data/System.Data/ConflictOptions.cs b/mcs/class/System.Data/System.Data/ConflictOptions.cs
index 93cfbce35c8c1f5101c521e6750899164dec225b..2b09cacd4b8742d3dbd205acfb7ea3172ae5abe9 100644 (file)
--- a/mcs/class/System.Data/System.Data/ConflictOptions.cs
+++ b/mcs/class/System.Data/System.Data/ConflictOptions.cs
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+
 
 namespace System.Data {
        public enum ConflictOptions 
@@ -52,4 +52,4 @@ namespace System.Data {
        }
 }
 
-#endif // NET_2_0
+