Lab resolving git conflicts [Diego Pérez Ortega]#33

diegoperezo97 wants to merge 3 commits intota-data-mex:masterta-data-mex/lab-resolving-git-conflicts:masterfrom

diegoperezo97:lab-resolving-git-conflictsdiegoperezo97/lab-resolving-git-conflicts:lab-resolving-git-conflictsCopy head branch name to clipboard