mirror of
https://github.com/nlohmann/json.git
synced 2026-10-03 05:00:30 +00:00
Conflicts: - tests/src/unit-custom-base-class.cpp: include list; kept this PR's <type_traits>/<utility> and develop's <vector> Signed-off-by: Niels Lohmann <mail@nlohmann.me>