Skip to content

Lab resolving git conflicts#15

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

Lab resolving git conflicts#15
beto-Sibileau wants to merge 3 commits intota-data-bcn:masterfrom
beto-Sibileau:lab-resolving-git-conflicts

Conversation

@beto-Sibileau
Copy link
Copy Markdown

Conflict proposed by the exercise and solved!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant