From 5d4ae8b029df3cb083b23daa6b6315c92a631fc4 Mon Sep 17 00:00:00 2001
From: Liam MONCHANIN <limonchani>
Date: Wed, 24 May 2023 11:54:12 +0200
Subject: [PATCH] merge conflict test 2

---
 notus/Biblioteque_de_Class/Note.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/notus/Biblioteque_de_Class/Note.cs b/notus/Biblioteque_de_Class/Note.cs
index 333ca9e..1a316c7 100644
--- a/notus/Biblioteque_de_Class/Note.cs
+++ b/notus/Biblioteque_de_Class/Note.cs
@@ -81,17 +81,10 @@ namespace Biblioteque_de_Class
                 if (image.GetName() == name)
                 {
                     ImageList.Remove(image);
-<<<<<<< HEAD
-                }
-                else
-                {
-                    throw new NullReferenceException("Image not found");
-=======
                     return;
->>>>>>> f534e27179564bf06ff0904ec99e31daf8662358
                 }
             }
-            throw new Exception("Image not found");
+            throw new NullReferenceException("Image not found");
         }
 
         /// <summary>