From 7af8f8cb0de83aca101a12d301578f87140df6e2 Mon Sep 17 00:00:00 2001
From: "matheo.thierry" <Matheo.THIERRY@etu.uca.fr>
Date: Tue, 6 Jun 2023 22:04:44 +0200
Subject: [PATCH] fix bug Database previous merge conflict

---
 notus/Biblioteque_de_Class/Database.cs | 10 +++++-----
 notus/notus_vue/notus_vue.csproj       |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/notus/Biblioteque_de_Class/Database.cs b/notus/Biblioteque_de_Class/Database.cs
index 685e232..2013dce 100644
--- a/notus/Biblioteque_de_Class/Database.cs
+++ b/notus/Biblioteque_de_Class/Database.cs
@@ -19,14 +19,14 @@ namespace Biblioteque_de_Class
         [DataMember]
         public List<Theme> ThemeList { get; private set; }
         [DataMember]
-        private List<User> UserList = null!;
-        public List<User> Users { get => UserList; private set
+        public List<User> Users;
+        public List<User> UserList
+        {
+            get => Users; private set
             {
-                UserList = value;
+                Users = value;
             }
         }
-        [DataMember]
-        private Dictionary<User, List<Theme>> AddedThemeList;
 
         public Database()
         {
diff --git a/notus/notus_vue/notus_vue.csproj b/notus/notus_vue/notus_vue.csproj
index 198a8ca..4484d15 100644
--- a/notus/notus_vue/notus_vue.csproj
+++ b/notus/notus_vue/notus_vue.csproj
@@ -56,9 +56,6 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\Biblioteque_de_Class\Biblioteque_de_Class.csproj" />
 	  <ProjectReference Include="..\Notus_Persistence\Notus_Persistance.csproj" />
-	  <ProjectReference Include="..\Tests\Notus_UnitTest_Database\Notus_UnitTest_Database.csproj" />
-	  <ProjectReference Include="..\Tests\Notus_UnitTest_Note\Notus_UnitTest_Note.csproj" />
-	  <ProjectReference Include="..\Tests\Notus_UnitTest_User\Notus_UnitTest_User.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>