提交 c82983b0 编写于 作者: M Manish Vasani

Fix conflicts

上级 27a06c20
......@@ -79,6 +79,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Services\SyntaxFacts\CSharpSyntaxKinds.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Services\SyntaxFacts\CSharpDocumentationCommentService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Services\SyntaxFacts\CSharpSyntaxFacts.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Simplification\Simplifiers\CastSimplifier.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utilities\FormattingRangeHelper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SpeculationAnalyzer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utilities\TypeStyle\CSharpTypeStyleHelper.cs" />
......
......@@ -412,4 +412,4 @@
<EmbeddedResource Include="$(MSBuildThisFileDirectory)CompilerExtensionsResources.resx" GenerateSource="true" Link="CompilerExtensionsResources.resx" />
<None Include="$(MSBuildThisFileDirectory)CompilerExtensionsResources.resx" />
</ItemGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -55,7 +55,6 @@
<Compile Include="$(MSBuildThisFileDirectory)LanguageServices\CSharpSemanticFactsService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)LanguageServices\CSharpRemoveUnnecessaryImportsService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)LanguageServices\CSharpRemoveUnnecessaryImportsService.Rewriter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Simplification\Simplifiers\CastSimplifier.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utilities\NameSyntaxComparer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utilities\NameSyntaxIterator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Utilities\CSharpSimplificationHelpers.cs" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册