From 48b64facc2b543ba6723019b2548b54438bd89fd Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Wed, 24 May 2023 11:50:38 +0200
Subject: [PATCH] fix sln conflict 2

---
 MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj b/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
index 545b9be..aff436e 100644
--- a/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
+++ b/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
@@ -19,17 +19,9 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-<<<<<<< HEAD
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Model\Model.csproj" />
-  </ItemGroup>
-
-</Project>
-=======
   <ItemGroup>
     <ProjectReference Include="..\..\Model\Model.csproj" />
     <ProjectReference Include="..\..\DataPersistence\DataPersistence.csproj" />
   </ItemGroup>
 </Project>
->>>>>>> dev
+