From 1adbc22fdeb6dce5a6628fd7cb4a7dc2883e25fc Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Thu, 6 Nov 2014 01:23:51 -0200 Subject: [PATCH] bugfix: remove conflict comment --- docs/docs/02.1-jsx-in-depth.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/docs/02.1-jsx-in-depth.md b/docs/docs/02.1-jsx-in-depth.md index cd18fd8c37..68f30db263 100644 --- a/docs/docs/02.1-jsx-in-depth.md +++ b/docs/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. \ No newline at end of file