Ajout de différentes fonctions, et modifications dans adminIut.c

3 years ago · 5d6fc7822e
parent ae0b375dbf
commit 5d6fc7822e
1 changed files with 0 additions and 4 deletions
--- a/adminIut.c
+++ b/adminIut.c
@ -119,10 +119,6 @@ ListeD Enfiler(ListeD ld, char departement[30], int nbP, char resp[30]) {
    }
    return ld;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> 3af764446c4614b06d8ad0449b4f994987a5e5af
 /*
 VilleIUT defiler(VilleIUT V){
    MaillonDept *temp;