bugfix: remove conflict comment

10 years ago · eedb2ffe04
1 changed files with 1 additions and 2 deletions
--- a/docs/02.1-jsx-in-depth.md
+++ b/docs/02.1-jsx-in-depth.md
@ -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.