Merge branch 'dev' of https://github.com/danielaparker/jsoncons

# Conflicts: # test/CMakeLists.txt
danielaparker · Nov 16, 2024 · ffd9a91 · ffd9a91
2 parents f2aa1c2 + 26d6cf7
commit ffd9a91
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -153,7 +153,7 @@ add_executable(unit_tests
                corelib/src/json_literal_operator_tests.cpp
                corelib/src/json_object_tests.cpp
                corelib/src/ojson_object_tests.cpp
-               corelib/src/json_options_tests.cpp 
+               corelib/src/json_options_tests.cpp
                corelib/src/json_parser_error_tests.cpp
                corelib/src/json_parser_position_tests.cpp
                corelib/src/json_parser_tests.cpp

diff --git a/test/corelib/src/json_parser_error_tests.cpp b/test/corelib/src/json_parser_error_tests.cpp
@@ -233,4 +233,3 @@ TEST_CASE("test_positive_integer_overflow")
     CHECK(j2.is<jsoncons::bigint>());
     CHECK(s2 == j2.as<std::string>());
 }
-