Javier Pradera - Resolving Git conflicts#20

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

javier-pradera:masterjavier-pradera/lab-resolving-git-conflicts:masterCopy head branch name to clipboard