amirho/react.dev
1
0
Fork 0
mirror of https://github.com/reactjs/react.dev.git synced 2026-02-27 03:08:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: remove conflict comment

Browse Source
This commit is contained in:
Pedro Nauck
2014-11-06 01:23:51 -02:00
parent f876868e9e
commit eedb2ffe04
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/02.1-jsx-in-depth.md
View File

@@ -201,5 +201,4 @@ var content = (
> NOTE:
>
> JSX is similar to HTML, but not exactly the same. See [JSX gotchas](/react/docs/jsx-gotchas.html) for some key differences.
>>>>>>> master
> JSX is similar to HTML, but not exactly the same. See [JSX gotchas](/react/docs/jsx-gotchas.html) for some key differences.