mirror of
https://github.com/nlohmann/json.git
synced 2026-10-02 23:15:17 +00:00
Conflicts in the See also lists of nine basic_json pages, is_discarded.md, and features/index.md, where develop (#5638) and this branch both added entries: kept both. Ran make amalgamate. Signed-off-by: Niels Lohmann <mail@nlohmann.me>