Fix merge conflict in examples.md #244
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The markup in examples.md has a few lines from an unresolved conflict from this merge particle-iot@9c3cd0e I just removed the git conflict markers and fixed the conflict.
|
Ohhhhh that's a nasty one. Thanks @bgrimes ! |
kennethlimcp
added a commit
that referenced
this pull request
Dec 6, 2015
Fix merge conflict in examples.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The markup in examples.md has a few lines from an unresolved conflict from this merge 9c3cd0e
I just removed the git conflict markers and fixed the conflict.