mirror of
https://github.com/nlohmann/json.git
synced 2026-10-01 12:10:32 +00:00
Conflicts: - tests/src/unit-alt-string.cpp: kept both new sections (this PR's "conversion between basic_json specializations (#2649)" and develop's "strict enum" regression test for #5667) Signed-off-by: Niels Lohmann <mail@nlohmann.me>