Lab resolving git conflicts#55

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

DanielAguilar1994:lab-resolving-git-conflictsDanielAguilar1994/lab-resolving-git-conflicts:lab-resolving-git-conflictsCopy head branch name to clipboard