From 3ba8819ee5aa7c61a1c012fd06951a288030b674 Mon Sep 17 00:00:00 2001
From: Liam MONCHANIN <limonchani>
Date: Wed, 24 May 2023 11:52:34 +0200
Subject: [PATCH] merge conflict test 1

---
 notus/Notus_Console/Program.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/notus/Notus_Console/Program.cs b/notus/Notus_Console/Program.cs
index ccba31e..3bc93c9 100644
--- a/notus/Notus_Console/Program.cs
+++ b/notus/Notus_Console/Program.cs
@@ -16,13 +16,8 @@ string nom = "u";
 string choixNom;
 string choixCouleur;
 string choixModif;
-<<<<<<< HEAD
-=======
-string _image = "u";
 int image_;
->>>>>>> 3245980afaac2e9fda6f81aa6ab0dfc3ccfefe59
 string choix;
-string newColor = "u";
 string color = "u";
 string color2;
 string color3;
@@ -183,13 +178,9 @@ while (boucle == 0)
             break;
 
         case "11":///Supprimer une image
-<<<<<<< HEAD
-            n.RemoveImage(nomImage);
-=======
             Console.WriteLine("Saisir numero de la note");
             image_ = Convert.ToInt32(Console.ReadLine());
             n.RemoveImage(image_);
->>>>>>> 3245980afaac2e9fda6f81aa6ab0dfc3ccfefe59
             break;
 
         case "12":///Deplacer une image