Fix merge issues

This commit is contained in:
Bjarke Berg
2022-04-20 15:42:27 +02:00
parent 23a49161d6
commit b19dab5f3a
17 changed files with 175 additions and 260 deletions

View File

@@ -3,8 +3,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>Umbraco.Cms.Tests.UnitTests</RootNamespace>
<IsPackable>false</IsPackable>
</PropertyGroup>