From c3b3e44959e8d322131ab97c3434147bcf75205c Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Tue, 20 Oct 2020 15:10:39 +0200
Subject: [PATCH] Fix merge

---
 src/Umbraco.Tests/Umbraco.Tests.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index a65441cae8..1f6b03323c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -141,7 +141,6 @@
     <Compile Include="Models\ContentXmlTest.cs" />
     <Compile Include="Models\ImageProcessorImageUrlGeneratorTest.cs" />
     <Compile Include="Models\VariationTests.cs" />
-    <Compile Include="Persistence\Mappers\MapperTestBase.cs" />
     <Compile Include="PublishedContent\SolidPublishedSnapshot.cs" />
     <Compile Include="Published\ConvertersTests.cs" />
     <Compile Include="Published\ModelTypeTests.cs" />
@@ -439,9 +438,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Integration\" />
-  </ItemGroup>
   <!-- get NuGet packages directory -->
   <PropertyGroup>
     <NuGetPackages>$(NuGetPackageFolders.Split(';')[0])</NuGetPackages>