From 1e90ddedfbb4e9f70672f5cea56a3824599d26f6 Mon Sep 17 00:00:00 2001 From: Lola CHALMIN Date: Fri, 13 Jan 2023 14:39:49 +0100 Subject: [PATCH] nickel --- part4.h | 1 - 1 file changed, 1 deletion(-) diff --git a/part4.h b/part4.h index 57b2ed1..cab8351 100644 --- a/part4.h +++ b/part4.h @@ -52,7 +52,6 @@ Filecand enfC(Filecand fC, Candidat c); Filechx enf(Filechx fchx, Choix c); Choix def(Filechx fc); Candidat defC(Filecand fC); -<<<<<<< HEAD int chargement (Candidat tCandAcc[], int tmax, FILEfe);// chargement des files cand et chx Filecand ChargementfileC(Filecand fC, int *nbC);//chargement pour la file d'attente