Merge branch 'develop' of https://github.com/nlohmann/json into ci

Conflicts: README.md
2021-02-07 14:30:09 +01:00 · 2021-02-07 14:30:09 +01:00 · 8d993523cf
commit 8d993523cf
parent 799472a308 e754ef7087
1 changed files with 1 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -577,7 +577,7 @@ j[1] = 42;
 bool foo = j.at(2);

 // comparison
-j == R"(["foo", 1, true])"_json;  // true
+j == R"(["foo", 1, true, 1.78])"_json;  // true

 // other stuff
 j.size();     // 3 entries