Fixed merge issue

This commit is contained in:
Bjarke Berg
2020-01-29 13:19:39 +01:00
parent 14f0005345
commit ddead752e2

View File

@@ -8,7 +8,6 @@
<ItemGroup>
<PackageReference Include="LightInject" Version="6.2.0" />
<PackageReference Include="LightInject.Annotation" Version="1.1.0" />
<PackageReference Include="LightInject.Web" Version="2.0.0" />
<PackageReference Include="Markdown" Version="2.2.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19554-01" />
@@ -33,7 +32,7 @@
<ItemGroup>
<_UnmanagedRegistrationCache Remove="obj\Umbraco.Infrastructure.csproj.UnmanagedRegistration.cache" />
</ItemGroup>
<ItemGroup>
<Compile Remove="obj\**" />