Skip to content

Conversation

@biermam
Copy link

@biermam biermam commented Oct 31, 2014

No description provided.

@PhillipNordwall
Copy link
Contributor

Fix your branch by running
git pull --rebase upstream dev and fix the merge conflict. When you commit your fixed merge conflict this pull request will automatically update.

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.

2 participants