-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Conversation
@bambii7 - thank you for submitting this PR. Could you please rebase on master? Then I can merge this in. |
Uh, now there are 105 commits here. You should submit only the commits that are specific to this PR. Feel free to open a new PR with your changes if rebasing on master & resolving the merge conflicts is proving challenging! |
Sorry @niveditc I rebased then pulled, think I needed to rebase then force push to keep HEAD in sync with upstream master. I'll see if I can correct. |
@niveditc has this fixed the issue? I'm still a little fresh at submitting pull requests through a fork. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
@bambii7 - awesome! One last thing - could you update the summary & test plan above? :) |
@niveditc done, thank you for your patience :) I'm better equiped to deal with more issues now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
niveditc is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
Summary: **Summary** Updating examples package.json to reference parent projects react & react dom versions. This ensures its kept in sync with the Draftjs version. **Test Plan** This commit updates example package.json. Not sure it is testable with jest. Unless its possible to detect when two versions of react are loaded. Pull Request resolved: facebookarchive#1691 Differential Revision: D10247219 fbshipit-source-id: 462c3d64efdbaca00563a0110d511f1865860b71
Summary: **Summary** Updating examples package.json to reference parent projects react & react dom versions. This ensures its kept in sync with the Draftjs version. **Test Plan** This commit updates example package.json. Not sure it is testable with jest. Unless its possible to detect when two versions of react are loaded. Pull Request resolved: facebookarchive/draft-js#1691 Differential Revision: D10247219 fbshipit-source-id: 462c3d64efdbaca00563a0110d511f1865860b71
Summary: **Summary** Updating examples package.json to reference parent projects react & react dom versions. This ensures its kept in sync with the Draftjs version. **Test Plan** This commit updates example package.json. Not sure it is testable with jest. Unless its possible to detect when two versions of react are loaded. Pull Request resolved: facebookarchive/draft-js#1691 Differential Revision: D10247219 fbshipit-source-id: 462c3d64efdbaca00563a0110d511f1865860b71
Before submitting a pull request, please make sure the following is done...
master
.npm test
)npm run lint
) and passes Flow (npm run flow
)Please use the simple form below as a guideline for describing your pull request.
Thanks for contributing to Draft.js!
Summary
Updating examples package.json to reference parent projects react & react dom versions. This ensures its kept in sync with the Draftjs version.
Test Plan
This commit updates example package.json. Not sure it is testable with jest. Unless its possible to detect when two versions of react are loaded.