mirror of
https://github.com/nlohmann/json.git
synced 2026-10-02 12:40:32 +00:00
Conflicts: - include/nlohmann/ordered_map.hpp: both emplace() overloads call develop's new append() helper (#5609) with the PR's std::forward<V>(t) - single_include/nlohmann/json.hpp: regenerated with make amalgamate Signed-off-by: Niels Lohmann <mail@nlohmann.me>