Sara Valverde/lab-resolving-git-conflicts#17

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

Alt-E-K:lab-resolving-git-conflictsAlt-E-K/lab-resolving-git-conflicts:lab-resolving-git-conflictsCopy head branch name to clipboard