merge conflict test 1
continuous-integration/drone/push Build is failing Details

pull/19/head
Liam MONCHANIN 2 years ago
parent 5dca89b57b
commit 3ba8819ee5

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

Loading…
Cancel
Save