-
由 Julien 提交于
Conflicts: src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/ConversionKind.cs src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/ConversionKindExtensions.cs src/Compilers/CSharp/Portable/Errors/MessageID.cs src/Compilers/CSharp/Portable/Parser/LanguageParser.cs src/Compilers/CSharp/Portable/PublicAPI.Unshipped.txt src/Compilers/CSharp/Portable/Syntax/Syntax.xml src/Compilers/CSharp/Portable/Syntax/SyntaxKind.cs src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj src/Compilers/CSharp/Test/Syntax/Parsing/ExpressionParsingTests.cs src/Test/Utilities/Desktop/TestResource.resx src/Test/Utilities/Shared/Traits/CompilerFeature.cs
cd510fd1