Skip to content

Commit

Permalink
Se modifican los datos del alumno Alvarado, Jose.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdalvaradocol committed Apr 10, 2021
1 parent 7c1e544 commit c62577c
Showing 1 changed file with 0 additions and 33 deletions.
33 changes: 0 additions & 33 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@

/*=====[Inclusion of own header]=============================================*/





#include "alumnos.h"
#include <stdio.h>

Expand Down Expand Up @@ -42,12 +38,6 @@

int main(int argc, char *argv[]) {
char cadena[128];

if (AlejandroRougier(cadena, sizeof(cadena))) {
printf("Alumno: %s\r\n", cadena);
} else {
printf("No se pudo serializar el alumno\r\n");
}

if (RodriguezOsvaldo(cadena, sizeof(cadena))) {
printf("Alumno: %s\r\n", cadena);
Expand Down Expand Up @@ -110,28 +100,6 @@ int main(int argc, char *argv[]) {
printf("No se pudo serializar el alumno\r\n");
}

<<<<<<< HEAD
if (GermanVelardez(cadena, sizeof(cadena))) {
printf("Alumno: %s\r\n", cadena);
} else {
printf("No se pudo serializar el alumno\r\n");
}









if (GermanVelardez(cadena, sizeof(cadena))) {
printf("Alumno: %s\r\n", cadena);
} else {
printf("No se pudo serializar el alumno\r\n");
}

=======
if (JoseAlvarado(cadena, sizeof(cadena)))
{
printf("Alumno: %s\r\n", cadena);
Expand All @@ -140,7 +108,6 @@ int main(int argc, char *argv[]) {
{
printf("No se pudo serializar el alumno\r\n");
}
>>>>>>> 73d525274ee31f953a502521fdc39bae3135dd71

return 0;
}

0 comments on commit c62577c

Please sign in to comment.