Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -3,8 +3,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
//
// @owner [....]
// @backupOwner [....]
// @owner avickers
// @backupOwner jeffders
//---------------------------------------------------------------------
using System.Collections;
using System.Data.Objects.DataClasses;
@@ -67,7 +67,7 @@ namespace System.Data.Objects.Internal
ObjectContext Context { get; set; }
/// <summary>
/// The merge option ----oicated with the wrapped entity.
/// The merge option assoicated with the wrapped entity.
/// </summary>
MergeOption MergeOption { get; }