Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -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
}
}