Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
--- a/external/referencesource/System.Web/UI/ConflictOptions.cs
+++ b/external/referencesource/System.Web/UI/ConflictOptions.cs
@@ -23,4 +23,4 @@ namespace System.Web.UI {
        /// </devdoc>
        CompareAllValues = 1
    }
-}
+}