From edbe6f050dcd51e121cd52442eddbd4e0b478342 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed, 21 Oct 2020 09:00:14 +0200
Subject: [PATCH] Fix merge

---
 .../Persistence/Repositories/DomainRepositoryTest.cs           | 0
 src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename src/Umbraco.Tests.Integration/{ => Umbraco.Infrastructure}/Persistence/Repositories/DomainRepositoryTest.cs (100%)

diff --git a/src/Umbraco.Tests.Integration/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs
similarity index 100%
rename from src/Umbraco.Tests.Integration/Persistence/Repositories/DomainRepositoryTest.cs
rename to src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
index 22b393a000..d0612b435a 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
+++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -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>