Lab resolving git conflicts#15

beto-Sibileau wants to merge 3 commits intota-data-bcn:masterta-data-bcn/lab-resolving-git-conflicts:masterfrom

beto-Sibileau:lab-resolving-git-conflictsbeto-Sibileau/lab-resolving-git-conflicts:lab-resolving-git-conflictsCopy head branch name to clipboard