mirror of
https://github.com/nlohmann/json.git
synced 2026-09-30 19:50:34 +00:00
Conflicts: - Makefile: include.zip lists both develop's $(AMALGAMATED_LITERALS_FILE) and this PR's meson_options.txt - meson.build: kept this PR's install_subdir(incdir / 'nlohmann'), which already installs develop's new json_literals.hpp in both header modes, in place of develop's per-file install_headers() lines Signed-off-by: Niels Lohmann <mail@nlohmann.me>