Lab resolving git conflicts#64

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

sahernandezr:lab-resolving-git-conflictssahernandezr/lab-resolving-git-conflicts:lab-resolving-git-conflictsCopy head branch name to clipboard