fix merge conflicts with codeplex

hohong · hohong · commit 00cae6c95744 · 2013-05-08T18:35:27.000-07:00
diff --git a/Release/tests/Functional/json/parsing_tests.cpp b/Release/tests/Functional/json/parsing_tests.cpp
@@ -296,4 +296,4 @@ TEST(deeply_nested)
 
 } // SUITE(parsing_tests)
 
-}}}
+}}}
