Victor Lopez - Lab resolving git conflicts#38

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

VictorLJay:lab-resolving-git-conflictsVictorLJay/lab-resolving-git-conflicts:lab-resolving-git-conflictsCopy head branch name to clipboard