Facebook/react
1
0 Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: remove conflict comment

Browse Source
This commit is contained in:
Pedro Nauck committed 2014-11-06 01:23:51 -02:00
1 parent a7f157ebb1
commit 1adbc22fde
1 file changed
+1 -2
Download Patch File Download Diff File Expand all files Collapse all files
docs/docs/02.1-jsx-in-depth.md
+1 -2
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.