Commit fbb7e9d

authored

Merge pull request #71 from reactjs/fix/merge-conflicts

Resolve merge conflicts

2 parents 0f65e18 + c369e70 commit fbb7e9dCopy full SHA for fbb7e9d

4 files changed

+20

-316

lines changed

src/content
- community
  - conferences.md
- learn

4 files changed

+20

-316

lines changed

Comments

(0)