Conflicts: - tests/src/unit-disabled_exceptions.cpp: kept both new sections (#5672 value(json_pointer) test and develop's ordered_json growth test) Signed-off-by: Niels Lohmann <mail@nlohmann.me>
Conflicts: - tests/src/unit-disabled_exceptions.cpp: kept both new sections (#5672 value(json_pointer) test and develop's ordered_json growth test) Signed-off-by: Niels Lohmann <mail@nlohmann.me>