Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4

mcs/class/referencesource/System.Web/UI/ConflictOptions.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <copyright file="ConflictOptions.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation.  All rights reserved.
+// </copyright>
+//------------------------------------------------------------------------------
+
+namespace System.Web.UI {
+
+    using System;
+
+    /// <devdoc>
+    /// Specifies a conflict resolution mode.
+    /// </devdoc>
+    public enum ConflictOptions {
+        
+        /// <devdoc>
+        /// Specifies that only the new values and the keys will be passed to the update or delete query
+        /// </devdoc>
+        OverwriteChanges = 0,
+    
+        /// <devdoc>
+        /// Specifies that the old values will also be passed to the update or delete query
+        /// </devdoc>
+        CompareAllValues = 1
+    }
+}