Se modifican los datos del alumno Alvarado, Jose

cese-ids · Apr 10, 2021 · c0cfb71 · c0cfb71
1 parent c62577c
commit c0cfb71
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/inc/alumnos.h b/inc/alumnos.h
@@ -61,11 +61,9 @@ bool EstebanVolentini(char * cadena, size_t espacio);
 
 bool LucasOrsi(char * cadena, size_t espacio);
 
-<<<<<<< HEAD
 bool GermanVelardez(char * cadena, size_t espacio);
-=======
+
 bool JoseAlvarado(char * cadena, size_t espacio);
->>>>>>> 73d525274ee31f953a502521fdc39bae3135dd71
 
 /*=====[Prototypes (declarations) of public interrupt functions]=============*/