mirror of
https://github.com/nlohmann/json.git
synced 2026-10-24 14:58:54 +00:00
Resolve the json_sax.hpp conflicts (keep the shared error state next to the object key index; the binary parser uses the shared error state as well) and drop the else after return in the diff stack-frame code. Signed-off-by: Niels Lohmann <mail@nlohmann.me>