mirror of
https://github.com/nlohmann/json.git
synced 2026-10-24 06:48:55 +00:00
Resolves the conflict in unit-json_view_image.cpp, where develop (#5889) and this branch each added a section to "json_view images: errors": both are kept. single_include is a fresh amalgamation. Signed-off-by: Niels Lohmann <mail@nlohmann.me>