mirror of
https://github.com/nlohmann/json.git
synced 2026-09-20 15:08:31 +00:00
Resolves a conflict in tests/src/unit-diagnostics.cpp: develop's swap(array_t&)/swap(object_t&) parent-pointer regression test and this branch's copy-descent regression test both added a new SECTION at the same place; kept both as siblings. Signed-off-by: Niels Lohmann <mail@nlohmann.me>