Oscar Tomas. Lab resolving git conflicts#40

Oscartomas94 wants to merge 4 commits intota-data-bcn:masterta-data-bcn/lab-resolving-git-conflicts:masterfrom

Oscartomas94:lab-resolving-git-conflictsOscartomas94/lab-resolving-git-conflicts:lab-resolving-git-conflictsCopy head branch name to clipboard