lab_git_merge [Samuel Simeone] - #1

Open

sasimeone24 wants to merge 3 commits into

Data-FT-MX:masterfrom

sasimeone24:lab-resolving-git-conflicts

Commits on Sep 4, 2021

Cambios en el archivo about-me.md
sasimeone24
committed
1f36bd5
Modificacion del archivo about-me.md con informacion sobre mi.
sasimeone24
committed
0415ea5
resolving conflicts with master branch
sasimeone24
committed
67f9aae