)]}'
{
  "commit": "5e9bf559b1cab5b9d97671a487c3f0d38c5eb382",
  "tree": "5d6a8ca4aac35ed595948ab5f375682d0c81939c",
  "parents": [
    "9561a122a3420c512517cbdb3fb1c6d61f756616"
  ],
  "author": {
    "name": "Niels Lohmann",
    "email": "mail@nlohmann.me",
    "time": "Sat Nov 16 23:23:05 2024 +0100"
  },
  "committer": {
    "name": "Niels Lohmann",
    "email": "mail@nlohmann.me",
    "time": "Sat Nov 16 23:23:05 2024 +0100"
  },
  "message": "# Conflicts:\n#\t.github/workflows/macos.yml\n#\tinclude/nlohmann/detail/input/parser.hpp\n#\tinclude/nlohmann/detail/meta/std_fs.hpp\n#\tinclude/nlohmann/json.hpp\n#\tsingle_include/nlohmann/json.hpp\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "c4609d2d12f4b8746de97a399614437831c295a8",
      "old_mode": 33188,
      "old_path": ".clang-tidy",
      "new_id": "ca6b9b09227c95ae6f0ca2bac3fcf3def29e2701",
      "new_mode": 33188,
      "new_path": ".clang-tidy"
    },
    {
      "type": "modify",
      "old_id": "0fd355bce53e407290d3f1780d15da22f185dda7",
      "old_mode": 33188,
      "old_path": ".github/workflows/cifuzz.yml",
      "new_id": "4e93d431d566caa984ea50fd1c46292f2ed5b607",
      "new_mode": 33188,
      "new_path": ".github/workflows/cifuzz.yml"
    },
    {
      "type": "modify",
      "old_id": "b6b03f7870e19c6c7b9187a7b2e22599ad486fe3",
      "old_mode": 33188,
      "old_path": ".github/workflows/macos.yml",
      "new_id": "152a4514b9f340bba8387d43045408940b4bcd71",
      "new_mode": 33188,
      "new_path": ".github/workflows/macos.yml"
    },
    {
      "type": "modify",
      "old_id": "c04904db121b638074ddc9e7002fb5e2753859cc",
      "old_mode": 33188,
      "old_path": ".github/workflows/ubuntu.yml",
      "new_id": "93bbba4c2e92fee1bbe9a99e821f301073c0b1a5",
      "new_mode": 33188,
      "new_path": ".github/workflows/ubuntu.yml"
    },
    {
      "type": "modify",
      "old_id": "15d84f16bedb2cf7fb745cee0f905d48105b48d7",
      "old_mode": 33188,
      "old_path": "BUILD.bazel",
      "new_id": "354460d27dbd63f7f4a73aa04ba1c74ecac24b3b",
      "new_mode": 33188,
      "new_path": "BUILD.bazel"
    },
    {
      "type": "modify",
      "old_id": "c7bbc7da4f75b2583f00f4b8670d04545616b886",
      "old_mode": 33188,
      "old_path": "CMakeLists.txt",
      "new_id": "bec5676ab55264942383b3a4335a5267a68bc25c",
      "new_mode": 33188,
      "new_path": "CMakeLists.txt"
    },
    {
      "type": "modify",
      "old_id": "9f8ff178265ad3ef273645dd89b8dc4add9656c6",
      "old_mode": 33188,
      "old_path": "README.md",
      "new_id": "25f443a7a19a86e3580dfe221acf7c93d6b8b1ac",
      "new_mode": 33188,
      "new_path": "README.md"
    },
    {
      "type": "modify",
      "old_id": "530f3a091b4a390714a2bddc34b04d0fb171f092",
      "old_mode": 33188,
      "old_path": "include/nlohmann/detail/conversions/from_json.hpp",
      "new_id": "2e0e3e3b7ecfc1c31d661b0e35373f04b712166b",
      "new_mode": 33188,
      "new_path": "include/nlohmann/detail/conversions/from_json.hpp"
    },
    {
      "type": "modify",
      "old_id": "562089c330ea12c2b1f59fcdbcd17ddbbd8ef956",
      "old_mode": 33188,
      "old_path": "include/nlohmann/detail/conversions/to_json.hpp",
      "new_id": "18c4493e757e3711507e8bb0706f5883256bd2dc",
      "new_mode": 33188,
      "new_path": "include/nlohmann/detail/conversions/to_json.hpp"
    },
    {
      "type": "modify",
      "old_id": "8b3bdeebc68cf77e9c0461468e06f2add3c52e3b",
      "old_mode": 33188,
      "old_path": "include/nlohmann/detail/input/json_sax.hpp",
      "new_id": "7eb30242ebf0eaf9c943d63a97226d87ca489755",
      "new_mode": 33188,
      "new_path": "include/nlohmann/detail/input/json_sax.hpp"
    },
    {
      "type": "modify",
      "old_id": "4b3bf77d624751b22c16ef93b1d7806414ec20c7",
      "old_mode": 33188,
      "old_path": "include/nlohmann/detail/input/lexer.hpp",
      "new_id": "059a0807390d20e7e09190b1a6d7fc8b7d867a20",
      "new_mode": 33188,
      "new_path": "include/nlohmann/detail/input/lexer.hpp"
    },
    {
      "type": "modify",
      "old_id": "0dd884a8bdff2ab956050a63128ce3d5ecf73954",
      "old_mode": 33188,
      "old_path": "include/nlohmann/detail/input/parser.hpp",
      "new_id": "3463a6540bbbc5a13f62aae89a49bf3612d2d7fe",
      "new_mode": 33188,
      "new_path": "include/nlohmann/detail/input/parser.hpp"
    },
    {
      "type": "modify",
      "old_id": "76293de22701c7662053a5e0a16addd4693a2bc1",
      "old_mode": 33188,
      "old_path": "include/nlohmann/detail/iterators/iteration_proxy.hpp",
      "new_id": "d361f865ebfbc4a28b1239281132974eff24e708",
      "new_mode": 33188,
      "new_path": "include/nlohmann/detail/iterators/iteration_proxy.hpp"
    },
    {
      "type": "modify",
      "old_id": "f475d57be800f9747f0ce91d61c57ad496930ae0",
      "old_mode": 33188,
      "old_path": "include/nlohmann/detail/output/binary_writer.hpp",
      "new_id": "11c46311b3a0f9ae390af7883b2a7c160c9005a8",
      "new_mode": 33188,
      "new_path": "include/nlohmann/detail/output/binary_writer.hpp"
    },
    {
      "type": "modify",
      "old_id": "d1195b432204e077bf728568aa4246dc816f991b",
      "old_mode": 33188,
      "old_path": "include/nlohmann/json.hpp",
      "new_id": "904dec0dcc9516abfad9aa671a8e947e1af4678e",
      "new_mode": 33188,
      "new_path": "include/nlohmann/json.hpp"
    },
    {
      "type": "modify",
      "old_id": "e960e65487c2e17d5c84f35a30108e7b186ae41c",
      "old_mode": 33188,
      "old_path": "single_include/nlohmann/json.hpp",
      "new_id": "455e65be99a9124eb0d7e55f148c6817dc7bc75e",
      "new_mode": 33188,
      "new_path": "single_include/nlohmann/json.hpp"
    },
    {
      "type": "modify",
      "old_id": "22a2ad2835f04b89b8cbc1c9556548b81d5338d1",
      "old_mode": 33188,
      "old_path": "tests/src/unit-32bit.cpp",
      "new_id": "9c534b73710d70d5779f43edcf9890c54a5cf5f8",
      "new_mode": 33188,
      "new_path": "tests/src/unit-32bit.cpp"
    },
    {
      "type": "modify",
      "old_id": "9f247fe6fea435ef6bf56093ff9fe42221be69f0",
      "old_mode": 33188,
      "old_path": "tests/src/unit-bjdata.cpp",
      "new_id": "a753bc3b1b20f837355516f0f6b9245557ba46bc",
      "new_mode": 33188,
      "new_path": "tests/src/unit-bjdata.cpp"
    },
    {
      "type": "modify",
      "old_id": "be94d2f6e17bf3d496226f7a0fac0f5d192b4e49",
      "old_mode": 33188,
      "old_path": "tests/src/unit-cbor.cpp",
      "new_id": "5d371f312574d928afc52880d7f74009f24fdd76",
      "new_mode": 33188,
      "new_path": "tests/src/unit-cbor.cpp"
    },
    {
      "type": "modify",
      "old_id": "ac0292531358703313ee83c278f13030d22744fc",
      "old_mode": 33188,
      "old_path": "tests/src/unit-class_lexer.cpp",
      "new_id": "7f7fcd78e906c2d6d3d6dad3e6a548a78e06a64d",
      "new_mode": 33188,
      "new_path": "tests/src/unit-class_lexer.cpp"
    },
    {
      "type": "modify",
      "old_id": "8692ada6d114c381035a085583b7dcba7bc41c04",
      "old_mode": 33188,
      "old_path": "tests/src/unit-conversions.cpp",
      "new_id": "8d71b63da65d6ab2af79da7681d7fb98a6183fa1",
      "new_mode": 33188,
      "new_path": "tests/src/unit-conversions.cpp"
    },
    {
      "type": "modify",
      "old_id": "65bb28a224a8ba47b30b671b3ff1282839c283ca",
      "old_mode": 33188,
      "old_path": "tests/src/unit-deserialization.cpp",
      "new_id": "0dc86beccbb78efb04893a255f052d8436b82519",
      "new_mode": 33188,
      "new_path": "tests/src/unit-deserialization.cpp"
    },
    {
      "type": "modify",
      "old_id": "55a07ede14ed941850e053c5683b55968e998458",
      "old_mode": 33188,
      "old_path": "tests/src/unit-element_access1.cpp",
      "new_id": "fc7c7c720c1cc9895d181fdd440d017c5d0f9a0c",
      "new_mode": 33188,
      "new_path": "tests/src/unit-element_access1.cpp"
    },
    {
      "type": "modify",
      "old_id": "0ef66bab7ad27f6927275dd2221549b82b12ee5c",
      "old_mode": 33188,
      "old_path": "tests/src/unit-element_access2.cpp",
      "new_id": "9c1c0cbff8131739c0ffb693ce9b2e686f47d068",
      "new_mode": 33188,
      "new_path": "tests/src/unit-element_access2.cpp"
    },
    {
      "type": "modify",
      "old_id": "0999393e6c0cf833e097d46a907228a967f3afe1",
      "old_mode": 33188,
      "old_path": "tests/src/unit-json_patch.cpp",
      "new_id": "2ab84d3643ebe92a6e15861dceca910f2d915b95",
      "new_mode": 33188,
      "new_path": "tests/src/unit-json_patch.cpp"
    },
    {
      "type": "modify",
      "old_id": "61162afaecc73c3db17e85c9ddcf42d2ef70380d",
      "old_mode": 33188,
      "old_path": "tests/src/unit-msgpack.cpp",
      "new_id": "5e26deeda8f8258cd28bc4584ab8b5ab134afc08",
      "new_mode": 33188,
      "new_path": "tests/src/unit-msgpack.cpp"
    },
    {
      "type": "modify",
      "old_id": "dc99073e20e62d0f0dffce5a1d494fc6a41d74a4",
      "old_mode": 33188,
      "old_path": "tests/src/unit-readme.cpp",
      "new_id": "85d23195523a7b4bb2cef339249ee97b0ed0056b",
      "new_mode": 33188,
      "new_path": "tests/src/unit-readme.cpp"
    },
    {
      "type": "modify",
      "old_id": "0172a45ea299e2feae7176bb5ca9bb65d0a20616",
      "old_mode": 33188,
      "old_path": "tests/src/unit-regression2.cpp",
      "new_id": "a1f5fe975a7f893aa366bb642f6c9f69dbe59e97",
      "new_mode": 33188,
      "new_path": "tests/src/unit-regression2.cpp"
    },
    {
      "type": "modify",
      "old_id": "e8f0e7e5bfcadcb35fca578504a8af8602356e69",
      "old_mode": 33188,
      "old_path": "tests/src/unit-serialization.cpp",
      "new_id": "44202f52dd8b66989b74d77644cff801340a1e45",
      "new_mode": 33188,
      "new_path": "tests/src/unit-serialization.cpp"
    },
    {
      "type": "modify",
      "old_id": "5807934baa9fc1db508924f0ac581c9b8f1f6398",
      "old_mode": 33188,
      "old_path": "tests/src/unit-testsuites.cpp",
      "new_id": "3fc5b5a8b13a440d416fb50797ea0b2e67e25807",
      "new_mode": 33188,
      "new_path": "tests/src/unit-testsuites.cpp"
    },
    {
      "type": "modify",
      "old_id": "06611c5fe144c178f8c9974c911428e18e02cfb6",
      "old_mode": 33188,
      "old_path": "tests/src/unit-ubjson.cpp",
      "new_id": "c00729692c6af6ac6c6746b040316dd4bdc08126",
      "new_mode": 33188,
      "new_path": "tests/src/unit-ubjson.cpp"
    },
    {
      "type": "modify",
      "old_id": "f5bbaf81181e7d302fa03fd8fb7a0cacad21caab",
      "old_mode": 33188,
      "old_path": "tests/src/unit-udt_macro.cpp",
      "new_id": "2c44fc7bde7b8ca608683195e7cd9d3cb6bb26f4",
      "new_mode": 33188,
      "new_path": "tests/src/unit-udt_macro.cpp"
    },
    {
      "type": "modify",
      "old_id": "e4405c474fd119e2ee00c1eb1a45c926b2670f2c",
      "old_mode": 33188,
      "old_path": "tests/src/unit-unicode1.cpp",
      "new_id": "6b71f847c2d485818ceaeda838ad04c3858efd8d",
      "new_mode": 33188,
      "new_path": "tests/src/unit-unicode1.cpp"
    }
  ]
}