Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged master and resolved conflicts #10893

Merged
merged 2 commits into from
Sep 27, 2017
Merged

Merged master and resolved conflicts #10893

merged 2 commits into from
Sep 27, 2017

Conversation

bvaughn
Copy link
Contributor

@bvaughn bvaughn commented Sep 27, 2017

Merged master. Stack seems to have been deleted. 😆

Search-and-replaced a bunch of markdown links to remove /react/ prefixes

@reactjs-bot
Copy link

reactjs-bot commented Sep 27, 2017

Deploy preview ready!

Built with commit a50382c

https://deploy-preview-10893--reactjs.netlify.com

];
}
```

> Note:
>
> Don't forget to [add keys](/docs/lists-and-keys.html#keys) to elements in a fragment to avoid the key warning.
> Don't forget to [add keys](https://facebook.github.io/react/docs/lists-and-keys.html#keys) to elements in a fragment to avoid the key warning.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This came in from master - looks like it was accidentally added via PR #10824

I've fixed it in this branch.

Copy link
Collaborator

@gaearon gaearon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine, see the above for one weird case.

@bvaughn bvaughn merged commit b08895f into gatsby Sep 27, 2017
@bvaughn bvaughn deleted the gatsby-merge-master-2 branch September 27, 2017 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants