importing messaging-2008 branch to trunk [continued]

[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..54a422df3c6cd0a6d6645182588d7c1321c7889a 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
+#if NET_2_0 || TARGET_JVM
 
 namespace System.Data {
        public enum ConflictOptions