-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Se agregan los datos del alumno De Leon, Lincoln
- Loading branch information
1 parent
ac74c8c
commit 018fd53
Showing
3 changed files
with
20 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
018fd53
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Los datos se debían agregar sobre una versión desactualizada del repositorio para que al momento de subirlos al servidor tuvieran un conflicto. Era requisito para aprobar esta parte del ejercicio resolver un conflicto. Para ello debes eliminar todas tus modificaciones con un commit, generar una nueva rama en cualquier commit anterior a este, hacer los cambios en esa rama y después integrarla en la rama master
018fd53
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No tengo presentadas la segunda y tercera parte del este trabajo practico.