mirror of
https://github.com/nlohmann/json.git
synced 2026-10-01 06:14:58 +01:00
Resolve the conflict in json.hpp by keeping both the comparison helpers and set_parents_after_object_erase() from #5552, and regenerate the amalgamation. Signed-off-by: Niels Lohmann <mail@nlohmann.me>