Fix merge
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user