From 4343f98f2fd01801ab778795a2cfe6a5ce2ddd42 Mon Sep 17 00:00:00 2001
From: PATRICK <PATRICK@PATRICKPC>
Date: Mon, 1 Apr 2024 00:43:40 +0200
Subject: [PATCH] fix

---
 Project/EntityFramework/TU/TU_API.csproj  | 1 -
 Project/EntityFramework/TU/TranslateTU.cs | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/Project/EntityFramework/TU/TU_API.csproj b/Project/EntityFramework/TU/TU_API.csproj
index 5997b08..7811f42 100644
--- a/Project/EntityFramework/TU/TU_API.csproj
+++ b/Project/EntityFramework/TU/TU_API.csproj
@@ -21,7 +21,6 @@
   <ItemGroup>
     <ProjectReference Include="..\API\API.csproj" />
     <ProjectReference Include="..\DbContext\DbContextLib.csproj" />
-    <ProjectReference Include="..\StubbedContext\StubbedContextLib.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Project/EntityFramework/TU/TranslateTU.cs b/Project/EntityFramework/TU/TranslateTU.cs
index 2af5660..ca2845f 100644
--- a/Project/EntityFramework/TU/TranslateTU.cs
+++ b/Project/EntityFramework/TU/TranslateTU.cs
@@ -147,9 +147,5 @@ namespace TU
             }
         }
 
-<<<<<<< HEAD
-   
-=======
->>>>>>> master
     }
 }