Fix merge

This commit is contained in:
Mole
2020-10-21 09:00:14 +02:00
parent 78a6b81ccc
commit edbe6f050d
2 changed files with 1 additions and 2 deletions

View File

@@ -73,8 +73,7 @@
</ItemGroup>
<ItemGroup>
<Compile Update="Services\Importing\ImportResources.Designer.cs">
<Folder Include="Umbraco\logs" />
<Compile Update="Services\Importing\ImportResources.Designer.cs" />
</ItemGroup>
<ItemGroup>