Guillermo: Lab resolving git conflicts#6

Open

GFiaMon wants to merge 2 commits intoironhack-labs:mainfrom

GFiaMon:lab-resolving-git-conflicts

Commits on Jan 23, 2025

I entered some new information about myself.

Guillermo Fiallo Montero
authored and
Guillermo Fiallo Montero
committed
this is my 3rd commit in this exercise. 1st was the one with the conflict. I do not know if this one is correct

Guillermo Fiallo Montero
authored and
Guillermo Fiallo Montero
committed