bugfix: remove conflict comment
Pedro Nauck committed
Nov 6, 2014 at 01:23 UTC
1adbc22fdeb6dce5a6628fd7cb4a7dc2883e25fc
1 file changed
+1
-2
docs/docs/02.1-jsx-in-depth.md
+1
-2
@@ -201,5 +201,4 @@ var content = (
201
202
> NOTE:
203
>
204
-> JSX is similar to HTML, but not exactly the same. See [JSX gotchas](/react/docs/jsx-gotchas.html) for some key differences.
205
->>>>>>> master
204
+> JSX is similar to HTML, but not exactly the same. See [JSX gotchas](/react/docs/jsx-gotchas.html) for some key differences.
\ No newline at end of file