From 54fab19ed1b0d3b59313091d4d336e31f21b05c8 Mon Sep 17 00:00:00 2001
From: jas88 <j.a.sutherland@dundee.ac.uk>
Date: Wed, 30 Aug 2023 08:08:43 -0500
Subject: [PATCH] Conflict resolve

---
 .../LoadModules.Extensions.Tests.csproj                     | 6 ++++++
 RDMP                                                        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj b/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
index a086263..c2ec866 100644
--- a/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
+++ b/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
@@ -13,6 +13,12 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <ItemGroup>
+    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\hic.rdmp.plugin.test\8.1.0-rc1\contentFiles\any\net6.0\testhost.dll" />
+    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\hic.rdmp.plugin.test\8.1.0-rc1\contentFiles\any\net6.0\testhost.exe" />
+    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\microsoft.testplatform.testhost\17.5.0\build\netcoreapp3.1\x64\testhost.dll" />
+    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\microsoft.testplatform.testhost\17.5.0\build\netcoreapp3.1\x64\testhost.exe" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
   </ItemGroup>
diff --git a/RDMP b/RDMP
index f696da6..a18976d 160000
--- a/RDMP
+++ b/RDMP
@@ -1 +1 @@
-Subproject commit f696da681d442863c7077dbac1ec4ecc634e0dca
+Subproject commit a18976dcbf5b2fd8eacf386b901ffeb1da6a5120