Address merge conflicts and cleanup

This commit is contained in:
Colton Sellers
2021-02-19 13:17:19 -08:00
parent cf936f6fe6
commit e076b51fb9
7 changed files with 7 additions and 9 deletions
@@ -47,6 +47,9 @@
<Message Text="IsLinux $(IsLinux)" Importance="high" />
<Message Text="ForceLinuxBuild $(ForceLinuxBuild)" Importance="high" />
</Target>
<ItemGroup>
<Compile Include="..\Common\Properties\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="QuantConnect.pythonnet" Version="2.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">